David S. Miller 9f6ec8d697 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/iwlwifi/iwl-agn-rxon.c drivers/net/wireless/rtlwifi/pci.c net/netfilter/ipvs/ip_vs_core.c		2011-06-20 22:29:08 -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	drivers/net/usb/catc.c: Fix potential deadlock in catc_ctrl_run()	2011-05-31 15:30:17 -07:00
cdc_eem.c
cdc_ether.c	net/usb: mark LG VL600 LTE modem ethernet interface as WWAN	2011-05-10 15:03:50 -07:00
cdc_ncm.c	usbnet/cdc_ncm: add missing .reset_resume hook	2011-06-01 21:10:49 -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	iph: use default get_stats	2011-06-08 17:05:29 -07:00
kalmia.c	net/usb: Add Samsung Kalmia driver for Samsung GT-B3730	2011-06-16 21:57:49 -04:00
kaweth.c
Kconfig	net/usb: Add Samsung Kalmia driver for Samsung GT-B3730	2011-06-16 21:57:49 -04:00
lg-vl600.c
Makefile	net/usb: Add Samsung Kalmia driver for Samsung GT-B3730	2011-06-16 21:57:49 -04:00
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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
zaurus.c