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=49e4e9da423de28b232d531d898eab868158de37;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 a07aede..34b5d0a 100644 --- a/WHENCE +++ b/WHENCE @@ -600,6 +600,7 @@ File: cis/LA-PCM.cis cis/DP83903.cis cis/NE2K.cis cis/tamarack.cis + cis/PE-200.cis Licence: GPL @@ -633,6 +634,9 @@ File: cis/MT5634ZLX.cis cis/RS-COM-2P.cis cis/COMpad2.cis cis/COMpad4.cis + cis/SW_555_SER.cis + cis/SW_7xx_SER.cis + cis/SW_8xx_SER.cis Licence: GPL diff --git a/cis/PE-200.cis b/cis/PE-200.cis new file mode 100644 index 0000000..266e061 Binary files /dev/null and b/cis/PE-200.cis differ diff --git a/cis/SW_555_SER.cis b/cis/SW_555_SER.cis new file mode 100644 index 0000000..12f474b Binary files /dev/null and b/cis/SW_555_SER.cis differ diff --git a/cis/SW_7xx_SER.cis b/cis/SW_7xx_SER.cis new file mode 100644 index 0000000..fbfc852 Binary files /dev/null and b/cis/SW_7xx_SER.cis differ diff --git a/cis/SW_8xx_SER.cis b/cis/SW_8xx_SER.cis new file mode 100644 index 0000000..18fd613 Binary files /dev/null and b/cis/SW_8xx_SER.cis differ