Merge branch 'for-upstream' of git://git.chelsio.net/pub/git/linux-firmware
[platform/upstream/linux-firmware.git] / iwlwifi-3160-7.ucode
2013-07-04 Emmanuel Grumbachiwlwifi: add firmware for 7260 / 3160 devices