projects / platform / upstream / linux-firmware.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 52d77db 11fdbda)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/egrumbach...
authorBen Hutchings <ben@decadent.org.uk>
Sun, 19 Jan 2014 23:30:21 +0000 (23:30 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 19 Jan 2014 23:31:58 +0000 (23:31 +0000)
commita0a6eebe9a80be41fb35b3cb77a314dce85404a3
tree9747b58938230b5036561f9029ff22d3234c2a6dtree | snapshot
parent52d77db9f133afe4d2b26aeccfd603745f45fda1commit | diff
parent11fdbda75cebef71e878fd0dfa6bfca984be35f4commit | diff
Merge branch 'master' of git://git./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
Domain: System / Kernel;