David S. Miller b4aa9e05a6 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/bnx2x/bnx2x.h drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-core.h drivers/vhost/vhost.c		2010-12-17 12:27:22 -08:00
..
asix.c	asix: add USB ID for Logitec LAN-GTJ U2A	2010-12-17 11:50:20 -08:00
catc.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
cdc_eem.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
cdc_ether.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-05-02 22:02:06 -07:00
cdc_ncm.c	USB CDC NCM host driver	2010-12-06 12:59:03 -08:00
cdc_subset.c
cdc-phonet.c	usbnet: remove direct access to urb->status	2010-07-05 18:50:55 -07:00
cx82310_eth.c	cx82310_eth: allow empty URBs	2010-09-13 20:02:53 -07:00
dm9601.c	drivers/net/usb: Use kmemdup	2010-05-17 17:44:48 -07:00
gl620a.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
hso.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-12-17 12:27:22 -08:00
int51x1.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ipheth.c	drivers/net/usb: Update WARN uses	2010-11-09 09:22:31 -08:00
kaweth.c	ethtool: Provide a default implementation of ethtool_ops::get_drvinfo	2010-08-17 02:31:15 -07:00
Kconfig	USB CDC NCM host driver	2010-12-06 12:59:03 -08:00
Makefile	USB CDC NCM host driver	2010-12-06 12:59:03 -08:00
mcs7830.c	drivers/net/usb: Use kmemdup	2010-05-17 17:44:47 -07:00
net1080.c	drivers/net: use __packed annotation	2010-06-03 03:18:23 -07:00
pegasus.c	drivers/net/usb: Remove unnecessary casts of netdev_priv	2010-11-17 10:36:52 -08:00
pegasus.h	usb: pegasus: fixed coding style issues	2010-06-30 10:26:16 -07:00
plusb.c	Update broken web addresses in the kernel.	2010-10-18 11:03:14 +02:00
rndis_host.c	net: Revert "rndis_host: Poll status channel before control channel"	2010-07-02 21:47:54 -07:00
rtl8150.c	net: use netdev_mc_count and netdev_mc_empty when appropriate	2010-02-12 11:38:58 -08:00
sierra_net.c	drivers/net: don't use flush_scheduled_work()	2010-12-12 16:45:14 +01:00
smsc75xx.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
smsc75xx.h	smsc75xx: SMSC LAN75xx USB gigabit ethernet adapter driver	2010-03-16 14:15:42 -07:00
smsc95xx.c	net: Use skb_checksum_start_offset()	2010-12-16 14:43:14 -08:00
smsc95xx.h
usbnet.c	drivers/net: don't use flush_scheduled_work()	2010-12-12 16:45:14 +01:00
zaurus.c