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

Resolved logic conflicts causing a build failure due to
drivers/net/r8169.c changes using a patch from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>

2011-04-26 12:16:46 -07:00

..

asix.c

asix: add USB ID for Logitec LAN-GTJ U2A

2010-12-17 11:50:20 -08:00

catc.c

…

cdc_eem.c

Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

2011-04-07 11:14:49 -07:00

cdc_ether.c

usbnet: use eth%d name for known ethernet devices

2011-04-01 20:12:02 -07:00

cdc_ncm.c

cdc_ncm: fix short packet issue on some devices

2011-04-24 22:35:19 -07:00

cdc_subset.c

usbnet: use eth%d name for known ethernet devices

2011-04-01 20:12:02 -07:00

cdc-phonet.c

NET: cdc-phonet, handle empty phonet header

2011-03-14 15:24:18 -07:00

cx82310_eth.c

cx82310_eth: allow empty URBs

2010-09-13 20:02:53 -07:00

dm9601.c

Added support for usb ethernet (0x0fe6, 0x9700)

2011-02-23 14:32:28 -08:00

gl620a.c

usbnet: use eth%d name for known ethernet devices

2011-04-01 20:12:02 -07:00

hso.c

Merge 2.6.38-rc6 into tty-next

2011-02-24 11:36:31 -08:00

int51x1.c

…

ipheth.c

drivers/net/usb: Update WARN uses

2010-11-09 09:22:31 -08:00

kaweth.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

Kconfig

usb: plusb: Add support for PL-25A1

2011-04-10 18:46:44 -07:00

lg-vl600.c

net/usb: Ethernet quirks for the LG-VL600 4G modem

2011-03-30 02:35:08 -07:00

Makefile

net/usb: Ethernet quirks for the LG-VL600 4G modem

2011-03-30 02:35:08 -07:00

mcs7830.c

USB: mcs7830: return negative if auto negotiate fails

2010-12-23 10:21:12 -08:00

net1080.c

usbnet: use eth%d name for known ethernet devices

2011-04-01 20:12:02 -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

usb: plusb: Add debug to reset function

2011-04-10 18:46:45 -07:00

rndis_host.c

rndis_host: Quirky devices are still 'point-to-point'

2011-04-14 23:23:45 -07:00

rtl8150.c

…

sierra_net.c

drivers/net: don't use flush_scheduled_work()

2010-12-12 16:45:14 +01:00

smsc75xx.c

net: convert SMSC USB net drivers to hw_features

2011-04-01 20:56:23 -07:00

smsc75xx.h

…

smsc95xx.c

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

2011-04-11 13:44:25 -07:00

smsc95xx.h

…

usbnet.c

drivers/net/usb/usbnet.c: Use FIELD_SIZEOF macro in usbnet_init() function.

2011-04-17 17:49:21 -07:00

zaurus.c

usbnet: use eth%d name for known ethernet devices

2011-04-01 20:12:02 -07:00