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

Conflicts:
	WHENCE

diff --cc WHENCE
index d0f4aa8,a27c9d5..877e1b3
--- 1/WHENCE
--- 2/WHENCE
+++ b/WHENCE
@@@ -373,84 -373,10 +373,94 @@@ License: Redistributable. See LICENCE.a
  
  --------------------------------------------------------------------------
  
 +Driver: CASSINI - Sun Cassini
 +
 +File: sun/cassini.bin
 +
 +Licence: Unknown
 +
 +Found in hex form in kernel source.
 +
 +--------------------------------------------------------------------------
 +
 +Driver: cxgb3 - Chelsio Terminator 3 1G/10G Ethernet adapter
 +
 +File: cxgb3/t3b_psram-1.1.0.bin.ihex
 +File: cxgb3/t3c_psram-1.1.0.bin.ihex
 +file: cxgb3/t3fw-7.0.0.bin.ihex
 +
 +License: GPLv2 or OpenIB.org BSD license, no source visible
 +
 +--------------------------------------------------------------------------
 +
 +Driver: e100 -- Intel PRO/100 Ethernet NIC
 +
 +File: e100/d101m_ucode.bin
 +File: e100/d101s_ucode.bin
 +File: e100/d102e_ucode.bin
 +
 +Licence: Unknown
 +
 +Found in hex form in kernel source.
 +
 +--------------------------------------------------------------------------
 +
 +Driver: acenic -- Alteon AceNIC Gigabit Ethernet card
 +
 +File: acenic/tg1.bin
 +File: acenic/tg2.bin
 +
 +Licence: Unknown
 +
 +Found in hex form in kernel source, but source allegedly available at
 +http://alteon.shareable.org/
 +
 +--------------------------------------------------------------------------
 +
 +Driver: tigon3 -- Broadcom Tigon3 based gigabit Ethernet cards
 +
 +File: tigon/tg3.bin
 +File: tigon/tg3_tso.bin
 +File: tigon/tg3_tso5.bin
 +
 +Licence:
 + * Firmware is:
 + *    Derived from proprietary unpublished source code,
 + *    Copyright (C) 2000-2003 Broadcom Corporation.
 + *
 + *    Permission is hereby granted for the distribution of this firmware
 + *    data in hexadecimal or equivalent format, provided this copyright
 + *    notice is accompanying it.
 +
 +Found in hex form in kernel source.
 +
 +--------------------------------------------------------------------------
 +
 +Driver: ADAPTEC_STARFIRE - Adaptec Starfire/DuraLAN support
 +
 +File: adaptec/starfire_rx.bin
 +File: adaptec/starfire_tx.bin
 +
 +Licence: Allegedly GPLv2, but no source visible.
 +
 +Found in hex form in kernel source, with the following notice:
 +
 + BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE IT IS LICENSED "AS IS" AND
 + THERE IS NO WARRANTY FOR THE PROGRAM, INCLUDING BUT NOT LIMITED TO THE
 + IMPLIED WARRANTIES OF MERCHANTIBILITY OR FITNESS FOR A PARTICULAR PURPOSE
 + (TO THE EXTENT PERMITTED BY APPLICABLE LAW). USE OF THE PROGRAM IS AT YOUR
 + OWN RISK. IN NO EVENT WILL ADAPTEC OR ITS LICENSORS BE LIABLE TO YOU FOR
 + DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
 + 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
++
++--------------------------------------------------------------------------