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

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