diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2011-01-08 22:01:05 +0000 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2011-01-08 22:01:05 +0000 |
commit | c3ba83bfdc98d3270d20b5a4df8bafce3c0ec685 (patch) | |
tree | 9e3f494c156a51b87de9d463bb298ed7ffa5533c | |
parent | 40c0f950be7040614dc45df54e25e54d00e3b73b (diff) | |
parent | 0daab4fab6f644984ea902705a24229345e1aa44 (diff) | |
download | linux-firmware-c3ba83bfdc98d3270d20b5a4df8bafce3c0ec685.tar.gz |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/bwh/linux-firmware
Conflicts:
WHENCE
-rw-r--r-- | LICENCE.via_vt6656 | 25 | ||||
-rw-r--r-- | WHENCE | 5 | ||||
-rw-r--r-- | vntwusb.fw | bin | 0 -> 11341 bytes |
3 files changed, 30 insertions, 0 deletions
diff --git a/LICENCE.via_vt6656 b/LICENCE.via_vt6656 new file mode 100644 index 00000000..f231f981 --- /dev/null +++ b/LICENCE.via_vt6656 @@ -0,0 +1,25 @@ +The following license applies to the binary-only VT6656 firmware +as contained in the file "vntwusb.fw" +================================================================ +Copyright 1998-2010 VIA Technologies, Inc. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. @@ -1492,3 +1492,8 @@ Licence: -------------------------------------------------------------------------- +Driver: vt6656 - VIA VT6656 USB wireless driver + +File: vntwusb.fw + +Licence: Redistributable. See LICENCE.via_vt6656 for details. diff --git a/vntwusb.fw b/vntwusb.fw Binary files differnew file mode 100644 index 00000000..2b5c3533 --- /dev/null +++ b/vntwusb.fw |