Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux...

diff --combined WHENCE
index d8f4806c93ae8385855b0c20777bfdf26d1b8826,ca97c1c18f515c6112a351e68d5835b5c7e50b1a..33a46ba26f1013430ec23f08a1ae5bfa2b276043
--- 1/WHENCE
--- 2/WHENCE
+++ b/WHENCE
@@@ -832,7 -832,7 +832,7 @@@ File: iwlwifi-7260-10.ucod
  Version: 23.15.10.0
  
  File: iwlwifi-7260-12.ucode
- Version: 25.15.12.0
+ Version: 25.17.12.0
  
  File: iwlwifi-3160-7.ucode
  Version: 22.1.7.0
@@@ -847,7 -847,7 +847,7 @@@ File: iwlwifi-3160-10.ucod
  Version: 23.15.10.0
  
  File: iwlwifi-3160-12.ucode
- Version: 25.15.12.0
+ Version: 25.17.12.0
  
  File: iwlwifi-7265-8.ucode
  Version: 22.24.8.0
@@@ -859,13 -859,13 +859,13 @@@ File: iwlwifi-7265-10.ucod
  Version: 23.15.10.0
  
  File: iwlwifi-7265-12.ucode
- Version: 25.15.12.0
+ Version: 25.17.12.0
  
  File: iwlwifi-7265D-10.ucode
  Version: 23.15.10.0
  
  File: iwlwifi-7265D-12.ucode
- Version: 25.15.12.0
+ Version: 25.17.12.0
  
  Licence: Redistributable. See LICENCE.iwlwifi_firmware for details
  
@@@ -2238,6 -2238,7 +2238,6 @@@ File: ar3k/AthrBT_0x31010000.df
  File: ar3k/ramps_0x31010000_40.dfu
  File: ar3k/AthrBT_0x11020000.dfu
  File: ar3k/ramps_0x11020000_40.dfu
 -File: ar3k/AthrBT_0x01020201.dfu
  File: ar3k/ramps_0x01020201_26.dfu
  File: ar3k/ramps_0x01020201_40.dfu
  File: ar3k/AthrBT_0x41020000.dfu
@@@ -2247,15 -2248,6 +2247,15 @@@ Licence: Redistributable. See LICENCE.a
  
  --------------------------------------------------------------------------
  
 +Driver: DFU Driver for Atheros bluetooth chipset AR3012
 +
 +File: ar3k/AthrBT_0x01020201.dfu
 +File: ar3k/1020201coex/ramps_0x01020201_26_HighPriority.dfu
 +
 +Licence: Redistributable. See LICENSE.QualcommAtheros_ar3k for details
 +
 +--------------------------------------------------------------------------
 +
  Driver:Atheros AR300x UART HCI Bluetooth Chip driver
  
  File: ar3k/1020201/PS_ASIC.pst