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

Emmanuel Grumbach says:

This is another pull request for another firmware. I am sorry not to
have put this together in the same pull request, but I just didn't know
when that new firmware would come out.
It doesn't replace the older one:
* iwlwifi-{7260,3160}-7.ucode is supported starting from 3.10
* iwlwifi-{7260,3160}-8.ucode is supported starting from 3.13

WHENCE

@@ -809,9 +809,15 @@ Version: 18.168.6.1
 File: iwlwifi-7260-7.ucode
 Version: 22.1.7.0
 
+File: iwlwifi-7260-8.ucode
+Version: 22.15.8.0
+
 File: iwlwifi-3160-7.ucode
 Version: 22.1.7.0
 
+File: iwlwifi-3160-8.ucode
+Version: 22.15.8.0
+
 Licence: Redistributable. See LICENCE.iwlwifi_firmware for details
 
 Also available from http://intellinuxwireless.org/?n=Downloads