David S. Miller
4180442058
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
...
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
net/ipv4/tcp_metrics.c
Overlapping changes between the "don't create two tcp metrics objects
with the same key" race fix in net and the addition of the destination
address in the lookup key in net-next.
Minor overlapping changes in bnx2x driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-01-18 00:55:41 -08:00
..
asix.h
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08: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
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
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00
cdc-phonet.c
net: cdc-phonet: Staticize usbpn_probe
2013-09-20 14:41:02 -04:00
cdc_eem.c
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00
cdc_ether.c
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00
cdc_mbim.c
net: cdc_mbim: fixup error return value
2013-11-04 15:40:16 -05:00
cdc_ncm.c
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00
cdc_subset.c
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00
cx82310_eth.c
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00
dm9601.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-01-18 00:55:41 -08:00
gl620a.c
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08: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
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00
kalmia.c
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00
kaweth.c
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00
Kconfig
r8152: change the descriptor
2014-01-14 18:48:54 -08: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
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00
net1080.c
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08: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
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08: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: ecm and vendor modes coexist
2014-01-14 18:48:54 -08:00
r8152.c
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00
rndis_host.c
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00
rtl8150.c
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00
sierra_net.c
usb: Fix FSF address in file headers
2013-12-06 12:37:55 -05:00
smsc75xx.c
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00
smsc75xx.h
usb: Fix FSF address in file headers
2013-12-06 12:37:55 -05:00
smsc95xx.c
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00
smsc95xx.h
usb: Fix FSF address in file headers
2013-12-06 12:37:55 -05:00
sr9700.c
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00
sr9700.h
USB2NET : SR9700 : One chip USB 1.1 USB2NET SR9700Device Driver Support
2013-09-03 22:26:03 -04:00
usbnet.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-01-14 14:42:42 -08:00
zaurus.c
drivers/net: delete non-required instances of include <linux/init.h>
2014-01-16 11:53:26 -08:00