From: David S. Miller Date: Fri, 6 Nov 2009 08:55:55 +0000 (-0800) Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=199a2619c5cc3e09aaff90ae8d62e9e37897eda0;hp=d9c8a3b8eee91d625156094e1c6095f8bbea1c7f;p=linux-firmware 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 --- diff --git a/WHENCE b/WHENCE index 7a8adc0..34b5d0a 100644 --- 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 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 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 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 index 0000000..116e713 Binary files /dev/null and b/bnx2x-e1h-5.2.7.0.fw differ