Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/usb/cdc_ether.c

All CDC ethernet devices of type USB_CLASS_COMM need to use
'&mbm_info'.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/WHENCE b/WHENCE
index 7a8adc06eb34b964ffe5479a464a08a698a33a32..34b5d0a036db7856389e8a92f8ff5cd08450f16b 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -678,8 +678,8 @@ Found in hex form in kernel source.
 
 Driver: bnx2x: Broadcom Everest
 
-File: bnx2x-e1-4.8.53.0.fw.ihex
-File: bnx2x-e1h-4.8.53.0.fw.ihex
+File: bnx2x-e1-5.2.7.0.fw.ihex
+File: bnx2x-e1h-5.2.7.0.fw.ihex
 
 License:
   Copyright (c) 2007-2009 Broadcom Corporation

diff --git a/bnx2x-e1-5.0.21.0.fw b/bnx2x-e1-5.0.21.0.fw
deleted file mode 100644 (file)
index 6f990e9..0000000
Binary files a/bnx2x-e1-5.0.21.0.fw and /dev/null differ

diff --git a/bnx2x-e1-5.2.7.0.fw b/bnx2x-e1-5.2.7.0.fw
new file mode 100644 (file)
index 0000000..8303cdc
Binary files /dev/null and b/bnx2x-e1-5.2.7.0.fw differ

diff --git a/bnx2x-e1h-5.0.21.0.fw b/bnx2x-e1h-5.0.21.0.fw
deleted file mode 100644 (file)
index de70fb8..0000000
Binary files a/bnx2x-e1h-5.0.21.0.fw and /dev/null differ

diff --git a/bnx2x-e1h-5.2.7.0.fw b/bnx2x-e1h-5.2.7.0.fw
new file mode 100644 (file)
index 0000000..116e713
Binary files /dev/null and b/bnx2x-e1h-5.2.7.0.fw differ