commit | a0a6eebe9a80be41fb35b3cb77a314dce85404a3 | [log] [tgz] |
---|---|---|
author | Ben Hutchings <ben@decadent.org.uk> | Sun Jan 19 23:30:21 2014 +0000 |
committer | Ben Hutchings <ben@decadent.org.uk> | Sun Jan 19 23:31:58 2014 +0000 |
tree | 9747b58938230b5036561f9029ff22d3234c2a6d | |
parent | 52d77db9f133afe4d2b26aeccfd603745f45fda1 [diff] | |
parent | 11fdbda75cebef71e878fd0dfa6bfca984be35f4 [diff] |
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