From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 10 Mar 2010 00:13:18 +0000 (+0000)
Subject: Merge remote branch 'origin/master' into master
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0989e227d506d523ba9c089a52294c21c6cdbfaa;p=linux-firmware

Merge remote branch 'origin/master' into master

Conflicts:
	WHENCE
---

0989e227d506d523ba9c089a52294c21c6cdbfaa
diff --cc WHENCE
index 8450383,5e502b8..f3d3e98
--- a/WHENCE
+++ b/WHENCE
@@@ -431,7 -432,15 +431,15 @@@ Licence: Redistributable. See LICENCE.a
  
  --------------------------------------------------------------------------
  
 -Driver: AR9271 - Atheros HTC device (USB)
++Driver: ar9271 - Atheros HTC device (USB)
+ 
+ File: ar9271.fw
+ 
+ Licence: Redistributable. See LICENCE.atheros_firmware for details
+ 
+ --------------------------------------------------------------------------
+ 
 -Driver: CASSINI - Sun Cassini
 +Driver: cassini - Sun Cassini
  
  File: sun/cassini.bin
  
@@@ -1193,12 -1184,11 +1204,21 @@@ 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: lgs8gxx - Legend Silicon GB20600 demodulator driver
 +
 +File: lgs8g75.fw
 +
 +Licence: Unknown
 +
 +Found in hex form in kernel source.
 +
 +--------------------------------------------------------------------------