Merge branch 'upstream' of http://git.decadent.org.uk/git/linux-firmware

Conflicts:
	WHENCE

diff --git a/LICENSE.radeon_rlc b/LICENSE.radeon_rlc
index 7d0312bdd67f2348e7a23c63a1ea7e77c68171fa..4ece3404c9cc55b834126d2c94a2bb821fe8e64c 100644 (file)
--- a/LICENSE.radeon_rlc
+++ b/LICENSE.radeon_rlc
@@ -1,4 +1,4 @@
-Copyright (C) 2009  Advanced Micro Devices, Inc. All rights reserved.
+Copyright (C) 2009, 2010  Advanced Micro Devices, Inc. All rights reserved.
 
 REDISTRIBUTION: Permission is hereby granted, free of any license fees,
 to any person obtaining a copy of this microcode (the "Software"), to

diff --git a/RTL8192E/boot.img b/RTL8192E/boot.img
new file mode 100644 (file)
index 0000000..16998bb
Binary files /dev/null and b/RTL8192E/boot.img differ

diff --git a/RTL8192E/data.img b/RTL8192E/data.img
new file mode 100644 (file)
index 0000000..4cabc4a
Binary files /dev/null and b/RTL8192E/data.img differ

diff --git a/RTL8192E/main.img b/RTL8192E/main.img
new file mode 100644 (file)
index 0000000..7703afd
Binary files /dev/null and b/RTL8192E/main.img differ

diff --git a/WHENCE b/WHENCE
index f3d3e9870aa90179092899c63b7e78a71efd4671..423d403fb3d948d96983f726c5ea5af160a0a2b5 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -1208,11 +1208,57 @@ Driver: radeon - ATI Radeon
 
 File: radeon/R600_rlc.bin
 File: radeon/R700_rlc.bin
+File: radeon/CEDAR_me.bin
+File: radeon/CEDAR_pfp.bin
+File: radeon/CEDAR_rlc.bin
+File: radeon/CYPRESS_me.bin
+File: radeon/CYPRESS_pfp.bin
+File: radeon/CYPRESS_rlc.bin
+File: radeon/JUNIPER_me.bin
+File: radeon/JUNIPER_pfp.bin
+File: radeon/JUNIPER_rlc.bin
+File: radeon/REDWOOD_me.bin
+File: radeon/REDWOOD_pfp.bin
+File: radeon/REDWOOD_rlc.bin
 
 Licence: Redistributable. See LICENSE.radeon_rlc for details.
 
 --------------------------------------------------------------------------
 
+Driver: s2255drv
+
+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.
+
+--------------------------------------------------------------------------
+
+Driver rtl8192e - Realtek 8192 PCI wireless driver
+
+Files: RTL8192E/*
+Licence: Redistributable, provided by Realtek in their driver
+         source download.
+
+--------------------------------------------------------------------------
+
+Driver: DFU Driver for Atheros bluetooth chipset AR3011
+
+File: ath3k-2.fw
+Info: v2.0
+
+Licence: Redistributable. See LICENCE.atheros_firmware for details
+
+--------------------------------------------------------------------------
+
 Driver: lgs8gxx - Legend Silicon GB20600 demodulator driver
 
 File: lgs8g75.fw

diff --git a/ath3k-2.fw b/ath3k-2.fw
new file mode 100644 (file)
index 0000000..3fa8cff
Binary files /dev/null and b/ath3k-2.fw differ

diff --git a/f2255usb.bin b/f2255usb.bin
new file mode 100644 (file)
index 0000000..51f94d0
Binary files /dev/null and b/f2255usb.bin differ

diff --git a/radeon/CEDAR_me.bin b/radeon/CEDAR_me.bin
new file mode 100644 (file)
index 0000000..a526806
Binary files /dev/null and b/radeon/CEDAR_me.bin differ

diff --git a/radeon/CEDAR_pfp.bin b/radeon/CEDAR_pfp.bin
new file mode 100644 (file)
index 0000000..f9b8263
Binary files /dev/null and b/radeon/CEDAR_pfp.bin differ

diff --git a/radeon/CEDAR_rlc.bin b/radeon/CEDAR_rlc.bin
new file mode 100644 (file)
index 0000000..1358c7a
Binary files /dev/null and b/radeon/CEDAR_rlc.bin differ

diff --git a/radeon/CYPRESS_me.bin b/radeon/CYPRESS_me.bin
new file mode 100644 (file)
index 0000000..fd6cc24
Binary files /dev/null and b/radeon/CYPRESS_me.bin differ

diff --git a/radeon/CYPRESS_pfp.bin b/radeon/CYPRESS_pfp.bin
new file mode 100644 (file)
index 0000000..b162957
Binary files /dev/null and b/radeon/CYPRESS_pfp.bin differ

diff --git a/radeon/CYPRESS_rlc.bin b/radeon/CYPRESS_rlc.bin
new file mode 100644 (file)
index 0000000..1358c7a
Binary files /dev/null and b/radeon/CYPRESS_rlc.bin differ

diff --git a/radeon/JUNIPER_me.bin b/radeon/JUNIPER_me.bin
new file mode 100644 (file)
index 0000000..fd6cc24
Binary files /dev/null and b/radeon/JUNIPER_me.bin differ

diff --git a/radeon/JUNIPER_pfp.bin b/radeon/JUNIPER_pfp.bin
new file mode 100644 (file)
index 0000000..b162957
Binary files /dev/null and b/radeon/JUNIPER_pfp.bin differ

diff --git a/radeon/JUNIPER_rlc.bin b/radeon/JUNIPER_rlc.bin
new file mode 100644 (file)
index 0000000..1358c7a
Binary files /dev/null and b/radeon/JUNIPER_rlc.bin differ

diff --git a/radeon/REDWOOD_me.bin b/radeon/REDWOOD_me.bin
new file mode 100644 (file)
index 0000000..3208c8e
Binary files /dev/null and b/radeon/REDWOOD_me.bin differ

diff --git a/radeon/REDWOOD_pfp.bin b/radeon/REDWOOD_pfp.bin
new file mode 100644 (file)
index 0000000..f9b8263
Binary files /dev/null and b/radeon/REDWOOD_pfp.bin differ

diff --git a/radeon/REDWOOD_rlc.bin b/radeon/REDWOOD_rlc.bin
new file mode 100644 (file)
index 0000000..1358c7a
Binary files /dev/null and b/radeon/REDWOOD_rlc.bin differ

diff --git a/s2250.fw b/s2250.fw
new file mode 100644 (file)
index 0000000..86fdbdf
Binary files /dev/null and b/s2250.fw differ

diff --git a/s2250_loader.fw b/s2250_loader.fw
new file mode 100644 (file)
index 0000000..da70aab
Binary files /dev/null and b/s2250_loader.fw differ