David S. Miller 1459143386 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ieee802154/fakehard.c

A bug fix went into 'net' for ieee802154/fakehard.c, which is removed
in 'net-next'.

Add build fix into the merge from Stephen Rothwell in openvswitch, the
logging macros take a new initial 'log' argument, a new call was added
in 'net' so when we merge that in here we have to explicitly add the
new 'log' arg to it else the build fails.

Signed-off-by: David S. Miller <davem@davemloft.net>

2014-11-21 22:28:24 -05:00

..

asix_common.c

usb: Fix FSF address in file headers

2013-12-06 12:37:55 -05:00

asix_devices.c

net: USB: Deletion of unnecessary checks before the function call "kfree"

2014-11-21 15:16:10 -05:00

asix.h

drivers/net: delete non-required instances of include <linux/init.h>

2014-01-16 11:53:26 -08:00

ax88172a.c

usb: Fix FSF address in file headers

2013-12-06 12:37:55 -05:00

ax88179_178a.c

ax88179_178a: fix bonding failure

2014-10-20 00:53:30 -04:00

catc.c

net: get rid of SET_ETHTOOL_OPS

2014-05-13 17:43:20 -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

cdc-ether: implement MULTICAST flag on the device

2014-11-07 15:17:45 -05:00

cdc_mbim.c

vlan: kill vlan_put_tag helper

2014-11-21 14:20:17 -05:00

cdc_ncm.c

net: cdc_ncm: allow tuning min_tx_pkt

2014-06-02 16:01:31 -07:00

cdc_subset.c

cdc_subset: deal with a device that needs reset for timeout

2014-08-02 15:44:18 -07:00

cdc-phonet.c

phonet: Replace calls to __skb_alloc_page with __dev_alloc_page

2014-11-12 00:00:14 -05: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

usbnet: remove generic hard_header_len check

2014-02-17 14:35:46 -05:00

hso.c

net: USB: Deletion of unnecessary checks before the function call "kfree"

2014-11-21 15:16:10 -05:00

huawei_cdc_ncm.c

net: huawei_cdc_ncm: add "subclass 3" devices

2014-07-17 16:49:50 -07:00

int51x1.c

usb: Fix FSF address in file headers

2013-12-06 12:37:55 -05:00

ipheth.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-06-03 23:32:12 -07:00

kalmia.c

drivers/net: delete non-required instances of include <linux/init.h>

2014-01-16 11:53:26 -08:00

kaweth.c

net: get rid of SET_ETHTOOL_OPS

2014-05-13 17:43:20 -04:00

Kconfig

net: fix USB network driver config option.

2014-08-06 16:00:20 -07:00

lg-vl600.c

lg-vl600: Convert uses of __constant_<foo> to <foo>

2014-03-12 15:28:06 -04:00

Makefile

r8152: disable the ECM mode

2014-03-05 20:40:24 -05:00

mcs7830.c

usbnet: remove generic hard_header_len check

2014-02-17 14:35:46 -05:00

net1080.c

usbnet: remove generic hard_header_len check

2014-02-17 14:35:46 -05:00

pegasus.c

net: get rid of SET_ETHTOOL_OPS

2014-05-13 17:43:20 -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

qmi_wwan: Add support for HP lt4112 LTE/HSPA+ Gobi 4G Modem

2014-11-16 16:04:09 -05:00

r8152.c

r8152: adjust rtl_start_rx

2014-11-21 14:52:57 -05:00

rndis_host.c

usbnet: remove generic hard_header_len check

2014-02-17 14:35:46 -05:00

rtl8150.c

usbnet: rtl8150: remove unused variable

2014-11-19 15:17:11 -05:00

sierra_net.c

usb: Fix FSF address in file headers

2013-12-06 12:37:55 -05:00

smsc75xx.c

usbnet: remove generic hard_header_len check

2014-02-17 14:35:46 -05:00

smsc75xx.h

usb: Fix FSF address in file headers

2013-12-06 12:37:55 -05:00

smsc95xx.c

usbnet: smsc95xx: dereferencing NULL pointer

2014-11-11 16:24:08 -05: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

sr9800.c

usbnet: remove generic hard_header_len check

2014-02-17 14:35:46 -05:00

sr9800.h

USB2NET : SR9800 : One chip USB2.0 USB2NET SR9800 Device Driver Support

2014-02-10 16:53:06 -08:00

usbnet.c

usbnet: add a callback for set_rx_mode

2014-10-28 17:26:19 -04:00

zaurus.c

drivers/net: delete non-required instances of include <linux/init.h>

2014-01-16 11:53:26 -08:00