From: David Woodhouse <David.Woodhouse@intel.com>
Date: Wed, 17 Mar 2010 20:39:53 +0000 (+0000)
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;h=8c3ff02adff5f8d492535ae78bf294b5c06baeac;hp=-c;p=linux-firmware

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

Conflicts:
	WHENCE
---

8c3ff02adff5f8d492535ae78bf294b5c06baeac
diff --combined WHENCE
index 5e502b8,19f7558..e38d34e
--- a/WHENCE
+++ b/WHENCE
@@@ -432,14 -432,6 +432,14 @@@ Licence: Redistributable. See LICENCE.a
  
  --------------------------------------------------------------------------
  
 +Driver: AR9271 - Atheros HTC device (USB)
 +
 +File: ar9271.fw
 +
 +Licence: Redistributable. See LICENCE.atheros_firmware for details
 +
 +--------------------------------------------------------------------------
 +
  Driver: CASSINI - Sun Cassini
  
  File: sun/cassini.bin
@@@ -663,9 -655,6 +663,9 @@@ Info: v8.24.2.
  File: iwlwifi-1000-3.ucode
  Info: v128.50.3.1
  
 +File: iwlwifi-6000-4.ucode
 +Info: v9.193.4.1
 +
  Licence: Redistributable. See LICENCE.iwlwifi_firmware for details
  
  Also available from http://intellinuxwireless.org/?n=Downloads
@@@ -1184,11 -1173,17 +1184,27 @@@ Found in hex form in kernel source
  
  --------------------------------------------------------------------------
  
 +Driver: radeon - ATI Radeon
 +
 +File: radeon/R600_rlc.bin
 +File: radeon/R700_rlc.bin
 +
 +Licence: Redistributable. See LICENSE.radeon_rlc for details.
 +
 +--------------------------------------------------------------------------
++
+ Driver: s2255drv
+ 
 -File: f2255.bin
++File: f2255usb.bin
+ File: s2250_loader.fw
+ File: s2250.fw
+ 
+ Licence:
+   Sensoray grants permission to use and redistribute these firmware
+   files for use with Sensoray devices, but not as a 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.
++