UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/drivers/net/usb
History
David S. Miller b05930f5d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c
	include/linux/inetdevice.h

The inetdevice.h conflict involves moving the IPV4_DEVCONF values
into a UAPI header, overlapping additions of some new entries.

The iwlwifi conflict is a context overlap.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2013-08-26 16:37:08 -04:00
..
Kconfig net: Move MII out from under NET_CORE and hide it 2013-06-19 22:22:56 -07:00
Makefile net/usb: add relative mii functions for r815x 2013-07-11 17:11:01 -07:00
asix.h net: asix: Move declaration of ax88172a_info to shared header 2013-08-13 14:13:52 -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 net: asix: Move declaration of ax88172a_info to shared header 2013-08-13 14:13:52 -07:00
ax88172a.c net: asix: Staticise non-exported symbols 2013-08-13 14:13:52 -07:00
ax88179_178a.c ax88179_178a: avoid copy of tx tcp packets 2013-08-03 21:55:52 -07:00
catc.c ethtool: fix drvinfo strings set in drivers 2013-01-06 21:06:31 -08: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 net/usb: add relative mii functions for r815x 2013-07-11 17:11:01 -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
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 hso: Fix stack corruption on some architectures 2013-08-21 20:47:59 -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
lg-vl600.c USB: Disable hub-initiated LPM for comms devices. 2012-05-18 15:42:55 -07: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
r815x.c net/usb/r815x: change the return value for bind functions 2013-07-31 14:49:13 -07:00
r8152.c r8152: add comments 2013-08-20 00:08:22 -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 usbnet: do not pretend to support SG/TSO 2013-07-26 13:48:22 -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 USBNET: increase max rx/tx qlen for improving USB3 thoughtput 2013-07-27 20:10:57 -07:00
zaurus.c USB: Disable hub-initiated LPM for comms devices. 2012-05-18 15:42:55 -07:00