diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2017-12-02 15:20:21 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-12-02 15:22:54 +0200 |
| commit | 80b0ebd488b3edaf3e5ed08c34a952c804e3a635 (patch) | |
| tree | c4f5433c8788ee6df79c04e63dc0a4df17b70773 /drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | |
| parent | 0fc66ddfaf8bb8f73c965f24928f8815b470304e (diff) | |
| parent | 2f7a3863191afc2c132854b7ffb1b867b4b9e8be (diff) | |
Merge tag 'iwlwifi-next-for-kalle-2017-11-29' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
First batch of iwlwifi updates for v4.16
* Rename the temporary name A000 to 22000;
* Change in the way we print the firmware version;
* Remove some unused code;
* Other small improvements;
kvalo:
There were conflicts, I fixed them with taking into account commit c2c48ddfc8b0
("iwlwifi: fix firmware names for 9000 and A000 series hw"):
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/iwl-config.h
CONFLICT (modify/delete): drivers/net/wireless/intel/iwlwifi/cfg/a000.c deleted in ca495785063c428641cc6df8888afd2587ca6677 and modified in HEAD. Version HEAD of drivers/net/wireless/intel/iwlwifi/cfg/a000.c left in tree.
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/fw/api/scan.h')
0 files changed, 0 insertions, 0 deletions