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

Conflicts:
	WHENCE

diff --git a/WHENCE b/WHENCE
index 5e502b875629db891ebf6dd22631fd8d2a093ccc..e38d34efeace8b5a281a026d44d6cbc59bbb6973 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -1192,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.
+

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/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