diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2010-03-17 20:39:53 +0000 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-03-17 20:40:13 +0000 |
commit | 8c3ff02adff5f8d492535ae78bf294b5c06baeac (patch) | |
tree | 5e6666aaa99015f42b7f150c9e5153c75a4db2c7 | |
parent | 764d482304e3b13024184b05d907fe4c291faa07 (diff) | |
parent | 8d8d1300b471b0f3ff4dc8b044a8b5de1b83bb24 (diff) | |
download | linux-firmware-backup-8c3ff02adff5f8d492535ae78bf294b5c06baeac.tar.gz |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-firmware
Conflicts:
WHENCE
-rw-r--r-- | WHENCE | 16 | ||||
-rw-r--r-- | f2255usb.bin | bin | 0 -> 180760 bytes | |||
-rw-r--r-- | s2250.fw | bin | 0 -> 9508 bytes | |||
-rw-r--r-- | s2250_loader.fw | bin | 0 -> 1092 bytes |
4 files changed, 16 insertions, 0 deletions
@@ -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 Binary files differnew file mode 100644 index 00000000..51f94d03 --- /dev/null +++ b/f2255usb.bin diff --git a/s2250.fw b/s2250.fw Binary files differnew file mode 100644 index 00000000..86fdbdfa --- /dev/null +++ b/s2250.fw diff --git a/s2250_loader.fw b/s2250_loader.fw Binary files differnew file mode 100644 index 00000000..da70aabf --- /dev/null +++ b/s2250_loader.fw |