diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-06 00:55:55 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-06 00:55:55 -0800 |
| commit | 199a2619c5cc3e09aaff90ae8d62e9e37897eda0 (patch) | |
| tree | 5350b980a4b07bbf3c2cadda51bf63f7407ffb68 /WHENCE | |
| parent | 49e4e9da423de28b232d531d898eab868158de37 (diff) | |
| parent | d9c8a3b8eee91d625156094e1c6095f8bbea1c7f (diff) | |
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>
Diffstat (limited to 'WHENCE')
| -rw-r--r-- | WHENCE | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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 |