Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/bwh/linux-firmware

Conflicts:
	WHENCE

diff --git a/LICENCE.via_vt6656 b/LICENCE.via_vt6656
new file mode 100644 (file)
index 0000000..f231f98
--- /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.

diff --git a/WHENCE b/WHENCE
index 92b1a41540a4488267076a17fc7c4fe3e91601d0..0bc162cfba6859d411d24b0a166296a01e6d6109 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -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
new file mode 100644 (file)
index 0000000..2b5c353
Binary files /dev/null and b/vntwusb.fw differ