1. 07 Dec, 2017 20 commits
  2. 02 Dec, 2017 1 commit
    • Kalle Valo's avatar
      Merge tag 'iwlwifi-next-for-kalle-2017-11-29' of... · 80b0ebd4
      Kalle Valo authored
      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 c2c48ddf
      ("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.
      80b0ebd4
  3. 30 Nov, 2017 19 commits