Conflicts: drivers/net/wireless/iwlwifi/iwl-6000.c net/core/dev.c
Attach a file by drag & drop or click to upload