David S. Miller 4ae127d1b6 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/smc911x.c		2008-06-13 20:52:39 -07:00
..
asix.c	net/usb: add support for Apple USB Ethernet Adapter	2008-05-22 06:19:30 -04:00
catc.c	misc drivers/net endianness noise	2008-05-21 16:55:59 -07:00
cdc_ether.c
cdc_subset.c
dm9601.c
gl620a.c
hso.c	HSO: add option hso driver	2008-06-11 21:58:39 -04:00
kaweth.c	net: Eliminate flush_scheduled_work() calls while RTNL is held.	2008-06-12 02:22:02 -07:00
kawethfw.h
Kconfig	HSO: add option hso driver	2008-06-11 21:58:39 -04:00
Makefile	HSO: add option hso driver	2008-06-11 21:58:39 -04:00
mcs7830.c
net1080.c
pegasus.c
pegasus.h
plusb.c
rndis_host.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-05-26 10:14:02 -07:00
rtl8150.c
usbnet.c
zaurus.c