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

WHENCE

@@ -1024,12 +1024,15 @@ File: bnx2x/bnx2x-e1h-7.0.20.0.fw
 File: bnx2x/bnx2x-e2-7.0.23.0.fw
 File: bnx2x/bnx2x-e1-7.0.23.0.fw
 File: bnx2x/bnx2x-e1h-7.0.23.0.fw
+File: bnx2x/bnx2x-e2-7.0.29.0.fw
+File: bnx2x/bnx2x-e1-7.0.29.0.fw
+File: bnx2x/bnx2x-e1h-7.0.29.0.fw
 
 License:
-  Copyright (c) 2007-2010 Broadcom Corporation
+  Copyright (c) 2007-2011 Broadcom Corporation
 
   This file contains firmware data derived from proprietary unpublished
-  source code, Copyright (c) 2007-2009 Broadcom Corporation.
+  source code, Copyright (c) 2007-2011 Broadcom Corporation.
 
   Permission is hereby granted for the distribution of this firmware data
   in hexadecimal or equivalent format, provided this copyright notice is
@@ -1080,7 +1083,7 @@ Found in hex form in kernel source.
 Driver: netxen_nic - NetXen Multi port (1/10) Gigabit Ethernet NIC
 
 File: phanfw.bin
-Info: v4.0.550
+Info: v4.0.579
 
 Licence: Redistributable. See LICENCE.phanfw for details.
 
@@ -1724,6 +1727,7 @@ File: ath6k/AR6003/hw1.0/data.patch.bin
 File: ath6k/AR6003/hw1.0/bdata.WB31.bin
 File: ath6k/AR6003/hw1.0/athwlan.bin.z77
 File: ath6k/AR6003/hw2.1.1
+File: ath6k/AR6003/hw2.1.1/fw-2.bin
 File: ath6k/AR6003/hw2.1.1/otp.bin
 File: ath6k/AR6003/hw2.1.1/athwlan.bin
 File: ath6k/AR6003/hw2.1.1/endpointping.bin