Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/egrumbach...
authorBen Hutchings <ben@decadent.org.uk>
Tue, 27 May 2014 20:20:29 +0000 (21:20 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 27 May 2014 20:21:16 +0000 (21:21 +0100)
commit2759a8611c8d61ddecb8b69007965c0cb603dc50
treeb729081128bfb1e028a2864d7f4cb74523f832b4
parentdec41bce44e0dff6a2c3358a958fadf22bf58858
parente2844339cb779c00f856c554958e16beca99b462
Merge branch 'master' of git://git./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.