From: Ben Hutchings <ben@decadent.org.uk>
Date: Tue, 27 May 2014 20:20:29 +0000 (+0100)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/egrumbach... 
X-Git-Tag: upstream/20141009~44
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2759a8611c8d61ddecb8b69007965c0cb603dc50;p=platform%2Fupstream%2Flinux-firmware.git

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.
---

2759a8611c8d61ddecb8b69007965c0cb603dc50