David S. Miller 508827ff0a Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/tokenring/tmspci.c
	drivers/net/ucc_geth_mii.c

2009-03-05 02:06:47 -08:00

..

asix.c

…

catc.c

…

cdc_ether.c

cdc_ether: add usb id for Ericsson F3507g

2009-03-01 20:44:21 -08:00

cdc_subset.c

…

dm9601.c

dm9601: new vendor/product IDs

2009-03-03 23:48:16 -08:00

gl620a.c

…

hso.c

…

kaweth.c

…

Kconfig

…

Makefile

…

mcs7830.c

…

net1080.c

…

pegasus.c

…

pegasus.h

…

plusb.c

…

rndis_host.c

…

rtl8150.c

…

smsc95xx.c

…

smsc95xx.h

…

usbnet.c

usbnet: make usbnet_get_link() fall back to ethtool_op_get_link()

2009-03-01 20:45:40 -08:00

zaurus.c

zaurus: add usb id for motomagx phones

2009-03-01 20:48:08 -08:00