From: David Woodhouse <David.Woodhouse@intel.com>
Date: Fri, 29 Jul 2011 22:07:59 +0000 (+0100)
Subject: Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=3c18048f65f07560fb4e1733f28b67350b5c90b1;p=linux-firmware

Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-firmware

Conflicts:
	WHENCE
---

3c18048f65f07560fb4e1733f28b67350b5c90b1
diff --cc WHENCE
index bc2e27f,3fa401e..d1f5ae9
--- a/WHENCE
+++ b/WHENCE
@@@ -1721,29 -1721,16 +1721,45 @@@ License: Redistributable.  See LICENCE.
  
  --------------------------------------------------------------------------
  
 +Driver: ath6kl - Atheros support for AR6003 WiFi-Bluetooth combo module
 +
 +File: ath6k/AR6003.1
 +File: ath6k/AR6003.1/hw2.1.1
 +File: ath6k/AR6003.1/hw2.1.1/athwlan.bin
 +File: ath6k/AR6003.1/hw2.1.1/bdata.SD31.bin
 +File: ath6k/AR6003.1/hw2.1.1/bdata.SD32.bin
 +File: ath6k/AR6003.1/hw2.1.1/bdata.WB31.bin
 +File: ath6k/AR6003.1/hw2.1.1/data.patch.bin
 +File: ath6k/AR6003.1/hw2.1.1/endpointping.bin
 +File: ath6k/AR6003.1/hw2.1.1/otp.bin
 +
 +License: Redistributable. See LICENCE.atheros_firmware for details
 +
 +--------------------------------------------------------------------------
 +
 +Driver: ath6kl - Atheros support for AR3001 WiFi-Bluetooth combo module
 +
 +File: ar3k/30101coex
 +File: ar3k/30101coex/ar3kbdaddr.pst
 +File: ar3k/30101coex/PS_ASIC_aclLowPri.pst
 +File: ar3k/30101coex/PS_ASIC_aclHighPri.pst
 +File: ar3k/30101coex/PS_ASIC.pst
 +File: ar3k/30101coex/RamPatch.txt
 +
 +License: Redistributable. See LICENCE.atheros_firmware for details
++
++--------------------------------------------------------------------------
++
+ Driver: drxk - Micronas DRX-K demodulator driver
+ 
+ File: dvb-usb-terratec-h5-drxk.fw
+ 
+ Licence:
+ TERRATEC grants permission to use and redistribute these firmware
+ files for use with TERRATEC devices, but not as part of the Linux
+ kernel or in any other form which would require these files themselves
+ to be covered by the terms of the GNU General Public License.
+ 
+ These firmware files are distributed in the hope that they will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.