linux_old1/drivers/net/usb
David S. Miller d4185bbf62 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

Minor conflict between the BCM_CNIC define removal in net-next
and a bug fix added to net.  Based upon a conflict resolution
patch posted by Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-11-10 18:32:51 -05:00
..
Kconfig smsc75xx: add wol support for more frame types 2012-11-03 15:24:01 -04:00
Makefile net: cdc_mbim: build the MBIM driver 2012-10-23 02:40:11 -04:00
asix.h asix: Add support for programming the EEPROM 2012-07-19 10:48:07 -07:00
asix_common.c usbnet: asix: apply introduced usb command APIs 2012-10-26 03:36:50 -04:00
asix_devices.c asix: Adds support for Lenovo 10/100 USB dongle. 2012-10-01 17:33:00 -04:00
ax88172a.c asix: Add support for programming the EEPROM 2012-07-19 10:48:07 -07:00
catc.c USB: remove dbg() usage in USB networking drivers 2012-09-20 17:53:14 -04:00
cdc-phonet.c cdc-phonet: Don't leak in usbpn_open 2012-08-08 16:04:47 -07:00
cdc_eem.c net: usb: cdc_eem: Fix rx skb allocation for 802.1Q VLANs 2012-11-07 21:12:26 -05:00
cdc_ether.c qmi_wwan/cdc_ether: move Novatel 551 and E362 to qmi_wwan 2012-10-26 03:44:34 -04:00
cdc_mbim.c net: cdc_mbim: Device Service Stream support 2012-10-23 02:40:11 -04:00
cdc_ncm.c net: cdc_ncm: error path lock fix 2012-10-28 19:07:58 -04:00
cdc_subset.c USB: Disable hub-initiated LPM for comms devices. 2012-05-18 15:42:55 -07:00
cx82310_eth.c net: cx82310_eth: use common match macro 2012-09-03 13:51:02 -04:00
dm9601.c usbnet: dm9601: apply introduced usb command APIs 2012-10-26 03:36:50 -04:00
gl620a.c USB: remove dbg() usage in USB networking drivers 2012-09-20 17:53:14 -04:00
hso.c TTY: use tty_port_register_device 2012-08-13 16:50:19 -07:00
int51x1.c usbnet: int51x1: apply introduced usb command APIs 2012-10-26 03:36:51 -04:00
ipheth.c usb/ipheth: Add iPhone 5 support 2012-10-18 15:34:30 -04:00
kalmia.c USB: Disable hub-initiated LPM for comms devices. 2012-05-18 15:42:55 -07:00
kaweth.c kaweth: print correct debug ptr 2012-10-11 15:12:33 -04:00
lg-vl600.c USB: Disable hub-initiated LPM for comms devices. 2012-05-18 15:42:55 -07:00
mcs7830.c usbnet: mcs7830: apply introduced usb command APIs 2012-10-26 03:36:51 -04:00
net1080.c usbnet: net1080: apply introduced usb command APIs 2012-10-26 03:36:51 -04:00
pegasus.c usbnet:pegasus: remove usb_get/put_dev in .probe and .disconnect 2012-06-12 18:50:23 -07:00
pegasus.h usb: pegasus: fixed coding style issues 2010-06-30 10:26:16 -07:00
plusb.c usbnet: plusb: apply introduced usb command APIs 2012-10-26 03:36:51 -04:00
qmi_wwan.c qmi_wwan/cdc_ether: move Novatel 551 and E362 to qmi_wwan 2012-10-26 03:44:34 -04:00
rndis_host.c USB 3.5-rc1 pull request 2012-05-22 15:50:46 -07:00
rtl8150.c USB: remove dbg() usage in USB networking drivers 2012-09-20 17:53:14 -04:00
sierra_net.c net: sierra: shut up sparse restricted type warnings 2012-10-28 19:09:02 -04:00
smsc75xx.c usbnet: smsc75xx: apply the introduced usbnet_{read|write}_cmd_nopm 2012-11-07 03:53:38 -05:00
smsc75xx.h smsc75xx: replace 0xffff with PHY_INT_SRC_CLEAR_ALL 2012-05-07 23:43:56 -04:00
smsc95xx.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-11-10 18:32:51 -05:00
smsc95xx.h smsc95xx: add wol support for more frame types 2012-10-31 13:32:36 -04:00
usbnet.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-11-10 18:32:51 -05:00
zaurus.c USB: Disable hub-initiated LPM for comms devices. 2012-05-18 15:42:55 -07:00