Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/linux-firmware-wimax

Conflicts:
	WHENCE
This commit is contained in:
David Woodhouse
2009-01-10 10:38:56 +00:00
3 changed files with 53 additions and 0 deletions

10
WHENCE
View File

@@ -454,3 +454,13 @@ Found in hex form in kernel source, with the following notice:
ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM.
--------------------------------------------------------------------------
Driver: i2400m-usb - Intel 2400 Wireless WiMAX Connection over USb
File: i2400m-fw-usb-1.3.sbcf
License: Redistributable. See LICENCE.i2400m for details
Also available from http://linuxwimax.org/Download
--------------------------------------------------------------------------