linux/drivers/net/usb
David S. Miller 56a4342dfe Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
	net/ipv6/ip6_tunnel.c
	net/ipv6/ip6_vti.c

ipv6 tunnel statistic bug fixes conflicting with consolidation into
generic sw per-cpu net stats.

qlogic conflict between queue counting bug fix and the addition
of multiple MAC address support.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-01-06 17:37:45 -05:00
..
asix_common.c usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
asix_devices.c usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
asix.h usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
ax88172a.c usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
ax88179_178a.c usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
catc.c usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
cdc_eem.c usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
cdc_ether.c r8152: support RTL8153 2014-01-01 22:54:15 -05:00
cdc_mbim.c net: cdc_mbim: fixup error return value 2013-11-04 15:40:16 -05:00
cdc_ncm.c net: cdc_ncm: cleanup a type issue in cdc_ncm_setup() 2013-11-14 03:10:30 -05:00
cdc_subset.c usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
cdc-phonet.c net: cdc-phonet: Staticize usbpn_probe 2013-09-20 14:41:02 -04:00
cx82310_eth.c usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
dm9601.c dm9601: work around tx fifo sync issue on dm962x 2013-12-18 17:46:55 -05:00
gl620a.c usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
hso.c hso: fix handling of modem port SERIAL_STATE notifications 2014-01-06 16:29:44 -05:00
huawei_cdc_ncm.c net: huawei_cdc_ncm: Introduce the huawei_cdc_ncm driver 2013-11-05 15:21:25 -05:00
int51x1.c usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05: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 usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
Kconfig dm9601: make it clear that dm9620/dm9621a are also supported 2013-12-18 17:46:55 -05:00
lg-vl600.c usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
Makefile net: huawei_cdc_ncm: Introduce the huawei_cdc_ncm driver 2013-11-05 15:21:25 -05:00
mcs7830.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00
net1080.c usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05: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 usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
qmi_wwan.c net: qmi_wwan: no need to check for resume if suspend exists 2013-11-04 15:40:16 -05:00
r815x.c r8152: support RTL8153 2014-01-01 22:54:15 -05:00
r8152.c r8152: replace the return value of rtl_ops_init 2014-01-06 16:24:09 -05:00
rndis_host.c usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
rtl8150.c drivers: net: usb: rtl8150: concurrent URB bugfix 2013-05-20 13:42:05 -07:00
sierra_net.c usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
smsc75xx.c usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
smsc75xx.h usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
smsc95xx.c usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
smsc95xx.h usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
sr9700.c USB2NET : SR9700 : One chip USB 1.1 USB2NET SR9700Device Driver Support 2013-09-03 22:26:03 -04:00
sr9700.h USB2NET : SR9700 : One chip USB 1.1 USB2NET SR9700Device Driver Support 2013-09-03 22:26:03 -04:00
usbnet.c usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
zaurus.c usb: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00