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

Conflicts:
	drivers/net/yellowfin.c

2009-09-02 00:32:56 -07:00

..

asix.c

usbnet: convert asix driver to net_device_ops

2009-03-21 19:41:02 -07:00

catc.c

usbnet: convert to netdev_tx_t

2009-09-01 01:13:22 -07:00

cdc_eem.c

cdc-eem: bad crc checking

2009-07-16 18:06:25 -07:00

cdc_ether.c

cdc_ether: additional PID's to the whitelist

2009-06-19 00:19:51 -07:00

cdc_subset.c

usbnet cdc_subset: fix issues talking to PXA gadgets

2009-06-20 01:21:53 -07:00

cdc-phonet.c

usbnet: convert to netdev_tx_t

2009-09-01 01:13:22 -07:00

dm9601.c

dm9601: Use netdev stats structure

2009-06-30 19:46:43 -07:00

gl620a.c

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

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

hso.c

usbnet: convert to netdev_tx_t

2009-09-01 01:13:22 -07:00

int51x1.c

usb driver for intellon int51x1 based PLC like devolo dlan duo

2009-04-21 01:55:59 -07:00

kaweth.c

usbnet: convert to netdev_tx_t

2009-09-01 01:13:22 -07:00

Kconfig

USB host CDC Phonet network interface driver

2009-07-21 12:40:39 -07:00

Makefile

USB host CDC Phonet network interface driver

2009-07-21 12:40:39 -07:00

mcs7830.c

usbnet: convert msc7830 driver to net_device_ops

2009-03-21 19:55:33 -07:00

net1080.c

net1080: Use netdev stats structure

2009-06-30 19:46:43 -07:00

pegasus.c

usbnet: convert to netdev_tx_t

2009-09-01 01:13:22 -07:00

pegasus.h

pegasus: Add new device ID.

2009-08-14 16:41:17 -07: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

rndis_host: allow rndis_wlan to see all indications

2009-08-04 16:44:17 -04:00

rtl8150.c

usbnet: convert to netdev_tx_t

2009-09-01 01:13:22 -07:00

smsc95xx.c

smsc95xx: remove EEPROM loaded check

2009-08-02 12:54:31 -07:00

smsc95xx.h

smsc95xx: configure LED outputs

2009-05-01 15:27:02 -07:00

usbnet.c

usbnet: convert to netdev_tx_t

2009-09-01 01:13:22 -07:00

zaurus.c

zaurus: add usb id for motomagx phones

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