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

Conflicts:

	drivers/net/usb/rndis_host.c
	drivers/net/wireless/b43/dma.c
	net/ipv6/ndisc.c

2008-03-27 18:48:56 -07:00

..

asix.c

Move usbnet.h and rndis_host.h to include/linux/usb

2008-01-31 19:27:00 -08:00

catc.c

[NET]: Kill eth_copy_and_sum().

2007-07-10 22:08:12 -07:00

cdc_ether.c

Move usbnet.h and rndis_host.h to include/linux/usb

2008-01-31 19:27:00 -08:00

cdc_subset.c

Move usbnet.h and rndis_host.h to include/linux/usb

2008-01-31 19:27:00 -08:00

dm9601.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2008-03-27 18:48:56 -07:00

gl620a.c

Move usbnet.h and rndis_host.h to include/linux/usb

2008-01-31 19:27:00 -08:00

kaweth.c

[NET]: kaweth was forgotten in msec switchover of usb_start_wait_urb

2008-01-08 23:30:15 -08:00

kawethfw.h

Move USB network drivers to drivers/net/usb.

2007-05-09 21:31:55 -04:00

Kconfig

[NET]: Let USB_USBNET always select MII.

2007-11-07 04:11:43 -08:00

Makefile

Move USB network drivers to drivers/net/usb.

2007-05-09 21:31:55 -04:00

mcs7830.c

Move usbnet.h and rndis_host.h to include/linux/usb

2008-01-31 19:27:00 -08:00

net1080.c

Move usbnet.h and rndis_host.h to include/linux/usb

2008-01-31 19:27:00 -08:00

pegasus.c

[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()

2007-10-10 16:51:42 -07:00

pegasus.h

Move USB network drivers to drivers/net/usb.

2007-05-09 21:31:55 -04:00

plusb.c

Move usbnet.h and rndis_host.h to include/linux/usb

2008-01-31 19:27:00 -08:00

rndis_host.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2008-03-27 18:48:56 -07:00

rtl8150.c

rtl8150: use default MTU of 1500

2008-02-03 04:26:15 -08:00

usbnet.c

Move usbnet.h and rndis_host.h to include/linux/usb

2008-01-31 19:27:00 -08:00

zaurus.c

Move usbnet.h and rndis_host.h to include/linux/usb

2008-01-31 19:27:00 -08:00