Merge git://git.chelsio.net/pub/git/linux-firmware

LICENCE.chelsio_firmware

+Copyright (c) 2011 Chelsio Communications
+All rights reserved.
+
+Chelsio Communication Terminator 4 ethernet controller firmware
+
+Redistribution and use in binary form, without modification, are permitted provided
+that the following conditions are met:
+
+1. Redistribution in binary form must reproduce the above copyright notice, this
+   list of conditions and the following disclaimer in the documentation and/or
+   other materials provided with the distribution.
+2. The name of Chelsio Communications may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+3. Reverse engineering, decompilation, or disassembly of this firmware is not
+   permitted.
+
+DISCLAIMER.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

WHENCE

@@ -533,6 +533,14 @@ Found in hex form in kernel source.
 
 --------------------------------------------------------------------------
 
+Driver: cxgb4 - Chelsio Terminator 4 1G/10G Ethernet adapter
+
+File: cxgb4/t4fw.bin
+
+Licence: Redistributable. See LICENCE.chelsio_firmware for details
+
+--------------------------------------------------------------------------
+
 Driver: e100 -- Intel PRO/100 Ethernet NIC
 
 File: e100/d101m_ucode.bin