David S. Miller 0c1072ae02 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/freescale/fec_main.c drivers/net/ethernet/renesas/sh_eth.c net/ipv4/gre.c The GRE conflict is between a bug fix (kfree_skb --> kfree_skb_list) and the splitting of the gre.c code into seperate files. The FEC conflict was two sets of changes adding ethtool support code in an "!CONFIG_M5272" CPP protected block. Finally the sh_eth.c conflict was between one commit add bits set in the .eesr_err_check mask whilst another commit removed the .tx_error_check member and assignments. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-07-03 14:55:13 -07:00
..
asix_common.c	asix: fix BUG in receive path when lowering MTU	2013-05-03 16:10:33 -04:00
asix_devices.c	usbnet: asix: apply usbnet_link_change	2013-04-11 15:57:16 -04:00
asix.h	net: asix: handle packets crossing URB boundaries	2013-01-18 14:13:29 -05:00
ax88172a.c	drivers: net: usb: Remove unnecessary alloc/OOM messages	2013-02-04 13:22:34 -05:00
ax88179_178a.c	usbnet: ax88179_178a: add .reset_resume hook	2013-06-28 21:34:28 -07:00
catc.c	ethtool: fix drvinfo strings set in drivers	2013-01-06 21:06:31 -08: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	net: cdc_ether: allow combined control and data interface	2013-07-02 01:47:41 -07:00
cdc_mbim.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-05-01 14:08:52 -07:00
cdc_ncm.c	usbnet: cdc_ncm: apply usbnet_link_change	2013-04-11 15:57:16 -04:00
cdc_subset.c	USB: Disable hub-initiated LPM for comms devices.	2012-05-18 15:42:55 -07:00
cdc-phonet.c	cdc-phonet: Don't leak in usbpn_open	2012-08-08 16:04:47 -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 usbnet_link_change	2013-04-11 15:57:17 -04:00
gl620a.c	USB: remove dbg() usage in USB networking drivers	2012-09-20 17:53:14 -04:00
hso.c	TTY: add tty_port_tty_hangup helper	2013-03-18 16:24:29 -07:00
int51x1.c	usbnet: int51x1: apply introduced usb command APIs	2012-10-26 03:36:51 -04:00
ipheth.c	net: ipheth: Add USB ID for iPad mini	2013-07-02 00:32:56 -07:00
kalmia.c	net/usb/kalmia: use %*phC to dump small buffers	2013-05-29 00:35:20 -07:00
kaweth.c	kaweth: print correct debug ptr	2012-10-11 15:12:33 -04:00
Kconfig	net: Move MII out from under NET_CORE and hide it	2013-06-19 22:22:56 -07:00
lg-vl600.c	USB: Disable hub-initiated LPM for comms devices.	2012-05-18 15:42:55 -07:00
Makefile	net/usb: new driver for RTL8152	2013-05-06 16:16:52 -04:00
mcs7830.c	usbnet: mcs7830: apply usbnet_link_change	2013-04-11 15:57:16 -04:00
net1080.c	usbnet: net1080: apply introduced usb command APIs	2012-10-26 03:36:51 -04:00
pegasus.c	usbnet: pegasus: endian bug in write_mii_word()	2013-05-03 16:10:23 -04:00
pegasus.h	drivers: net: usb: pegasus: fix control urb submission	2013-04-29 13:57:50 -04:00
plusb.c	usbnet: plusb: apply introduced usb command APIs	2012-10-26 03:36:51 -04:00
qmi_wwan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-07-03 14:55:13 -07:00
r8152.c	net/usb: r8152: Use module_usb_driver()	2013-05-17 14:18:35 -07:00
rndis_host.c	remove init of dev->perm_addr in drivers	2013-01-08 18:00:48 -08:00
rtl8150.c	drivers: net: usb: rtl8150: concurrent URB bugfix	2013-05-20 13:42:05 -07:00
sierra_net.c	sierra_net: keep status interrupt URB active	2013-05-08 13:13:29 -07:00
smsc75xx.c	Merge 3.9-rc6 into usb-next	2013-04-08 08:36:40 -07:00
smsc75xx.h	smsc75xx: replace 0xffff with PHY_INT_SRC_CLEAR_ALL	2012-05-07 23:43:56 -04:00
smsc95xx.c	usbnet: smsc95xx: don't recover device if suspend fails in system sleep	2013-03-25 10:55:46 -07:00
smsc95xx.h	smsc95xx: support PHY wakeup source	2012-11-23 14:15:18 -05:00
usbnet.c	USB: remove remaining instances of USB_SUSPEND	2013-05-15 13:44:44 -04:00
zaurus.c	USB: Disable hub-initiated LPM for comms devices.	2012-05-18 15:42:55 -07:00