From: David Woodhouse 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=764d482304e3b13024184b05d907fe4c291faa07;p=linux-firmware Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-firmware Conflicts: WHENCE --- diff --git a/WHENCE b/WHENCE index 5e502b8..e38d34e 100644 --- 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 index 0000000..51f94d0 Binary files /dev/null and b/f2255usb.bin differ diff --git a/s2250.fw b/s2250.fw new file mode 100644 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 index 0000000..da70aab Binary files /dev/null and b/s2250_loader.fw differ