David S. Miller 7143b7d412 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/tg3.c		2011-05-05 14:59:02 -07:00
..
asix.c	ethtool: Call ethtool's get/set_settings callbacks with cleaned data	2011-04-29 14:01:30 -07:00
catc.c	ethtool: cosmetic: Use ethtool ethtool_cmd_speed API	2011-04-29 14:03:01 -07:00
cdc_eem.c	Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6	2011-04-07 11:14:49 -07:00
cdc_ether.c	usbnet: add support for some Huawei modems with cdc-ether ports	2011-04-29 12:40:20 -07:00
cdc_ncm.c	cdc_ncm: fix short packet issue on some devices	2011-04-24 22:35:19 -07:00
cdc_subset.c
cdc-phonet.c
cx82310_eth.c
dm9601.c	ethtool: Call ethtool's get/set_settings callbacks with cleaned data	2011-04-29 14:01:30 -07:00
gl620a.c
hso.c
int51x1.c
ipheth.c
kaweth.c
Kconfig	usb: plusb: Add support for PL-25A1	2011-04-10 18:46:44 -07:00
lg-vl600.c
Makefile
mcs7830.c
net1080.c
pegasus.c
pegasus.h
plusb.c	usb: plusb: Add debug to reset function	2011-04-10 18:46:45 -07:00
rndis_host.c	rndis_host: Quirky devices are still 'point-to-point'	2011-04-14 23:23:45 -07:00
rtl8150.c	ethtool: cosmetic: Use ethtool ethtool_cmd_speed API	2011-04-29 14:03:01 -07:00
sierra_net.c
smsc75xx.c	ethtool: Call ethtool's get/set_settings callbacks with cleaned data	2011-04-29 14:01:30 -07:00
smsc75xx.h
smsc95xx.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-05-05 14:59:02 -07:00
smsc95xx.h
usbnet.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-05-05 14:59:02 -07:00
zaurus.c