David S. Miller 9b963e5d0e Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/ieee802154/fakehard.c drivers/net/e1000e/ich8lan.c drivers/net/e1000e/phy.c drivers/net/netxen/netxen_nic_init.c drivers/net/wireless/ath/ath9k/main.c		2009-11-29 00:57:15 -08:00
..
asix.c	usbnet: Set link down initially for drivers that update link state	2009-11-10 20:54:40 -08:00
catc.c	netdev: drivers should make ethtool_ops const	2009-09-02 01:03:33 -07:00
cdc-phonet.c	cdc-phonet: remove noisy debug statement	2009-09-14 17:03:33 -07:00
cdc_eem.c	USB: Fix CDC EEM host driver 'sentinel' CRC validation	2009-09-23 06:46:34 -07:00
cdc_ether.c	usbnet: Set link down initially for drivers that update link state	2009-11-10 20:54:40 -08:00
cdc_subset.c
dm9601.c	usbnet: Set link down initially for drivers that update link state	2009-11-10 20:54:40 -08:00
gl620a.c
hso.c	hso: fix soft-lockup	2009-11-23 10:54:47 -08:00
int51x1.c
kaweth.c	convert kaweth to use usb_reset_configuration()	2009-10-29 23:06:39 -07:00
Kconfig	cdc_ether: additional Ericsson MBM PID's to the whitelist	2009-11-04 05:25:02 -08:00
Makefile
mcs7830.c	netdev: drivers should make ethtool_ops const	2009-09-02 01:03:33 -07:00
net1080.c
pegasus.c	net: Teach pegasus driver to ignore bluetoother adapters with clashing Vendor:Product IDs	2009-10-13 00:35:54 -07:00
pegasus.h	net: Teach pegasus driver to ignore bluetoother adapters with clashing Vendor:Product IDs	2009-10-13 00:35:54 -07:00
plusb.c
rndis_host.c	USB: rndis_host: debug info clobbered before it is logged	2009-10-30 14:57:33 -07:00
rtl8150.c	netdev: drivers should make ethtool_ops const	2009-09-02 01:03:33 -07:00
smsc95xx.c	smsc95xx: fix transmission where ZLP is expected	2009-09-22 14:28:26 -07:00
smsc95xx.h
usbnet.c	usbnet: Set link down initially for drivers that update link state	2009-11-10 20:54:40 -08:00
zaurus.c