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

[linux-firmware] / WHENCE

diff --git a/WHENCE b/WHENCE
index ca9bc762294f1f63aa7eafdfce7d694242cf1a2d..e38d34efeace8b5a281a026d44d6cbc59bbb6973 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -432,6 +432,14 @@ Licence: Redistributable. See LICENCE.atheros_firmware for details
 
 --------------------------------------------------------------------------
 
+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
@@ -1184,3 +1192,19 @@ File: radeon/R700_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.
+