Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/egrumbach/linux-firmware

Emmanuel Grumbach says:

I am sending (yet) another pull request to update the firmware for
iwlwifi 7260 / 7265 / 3160 devices,

So we have here a firmware for 7265 (this device has no firmware in
linux-firmware.git yet) and updates for the three aforementioned
devices.

LICENCE.iwlwifi_firmware

-Copyright (c) 2006-2013, Intel Corporation.
+Copyright (c) 2006-2014, Intel Corporation.
 All rights reserved.
 
 Redistribution.  Redistribution and use in binary form, without

WHENCE

@@ -812,15 +812,27 @@ Version: 22.1.7.0
 File: iwlwifi-7260-8.ucode
 Version: 22.24.8.0
 
+File: iwlwifi-7260-9.ucode
+Version: 23.214.9.0
+
 File: iwlwifi-3160-7.ucode
 Version: 22.1.7.0
 
 File: iwlwifi-3160-8.ucode
 Version: 22.24.8.0
 
+File: iwlwifi-3160-9.ucode
+Version: 23.214.9.0
+
+File: iwlwifi-7265-8.ucode
+Version: 22.24.8.0
+
+File: iwlwifi-7265-9.ucode
+Version: 23.214.9.0
+
 Licence: Redistributable. See LICENCE.iwlwifi_firmware for details
 
-Also available from http://wireless.kernel.org/en/users/Drivers/iwlwifi/?n=Downloads
+Also available from http://wireless.kernel.org/en/users/Drivers/iwlwifi#Firmware
 
 --------------------------------------------------------------------------