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

The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

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

2017-06-15 11:59:32 -04:00

..

lmc

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

.gitignore

…

c101.c

net: use core MTU range checking in WAN drivers

2016-10-20 14:51:09 -04:00

cosa.c

Annotate hardware config module parameters in drivers/net/wan/

2017-04-20 12:02:32 +01:00

cosa.h

…

dlci.c

net: Fix inconsistent teardown and release of private netdev state.

2017-06-07 15:53:24 -04:00

dscc4.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

farsync.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

farsync.h

…

fsl_ucc_hdlc.c

net/wan/fsl_ucc_hdlc: fix muram allocation error

2017-05-22 12:28:45 -04:00

fsl_ucc_hdlc.h

net/wan/fsl_ucc_hdlc: add hdlc-bus support

2017-05-18 10:28:39 -04:00

hd64570.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

hd64570.h

net: Spelling s/transmition/transmission/

2014-01-14 17:11:26 -08:00

hd64572.c

drivers: net: generalize napi_complete_done()

2017-01-30 15:10:42 -05:00

hd64572.h

net: Spelling s/transmition/transmission/

2014-01-14 17:11:26 -08:00

hdlc_cisco.c

WAN: HDLC: Call notifiers before and after changing device type

2015-12-05 17:41:42 -05:00

hdlc_fr.c

net: Fix inconsistent teardown and release of private netdev state.

2017-06-07 15:53:24 -04:00

hdlc_ppp.c

WAN: HDLC: Call notifiers before and after changing device type

2015-12-05 17:41:42 -05:00

hdlc_raw_eth.c

net: make struct net_device::tx_queue_len unsigned int

2017-05-18 10:19:30 -04:00

hdlc_raw.c

WAN: HDLC: Call notifiers before and after changing device type

2015-12-05 17:41:42 -05:00

hdlc_x25.c

WAN: HDLC: Call notifiers before and after changing device type

2015-12-05 17:41:42 -05:00

hdlc.c

net: use core MTU range checking in WAN drivers

2016-10-20 14:51:09 -04:00

hostess_sv11.c

Annotate hardware config module parameters in drivers/net/wan/

2017-04-20 12:02:32 +01:00

ixp4xx_hss.c

net: use core MTU range checking in WAN drivers

2016-10-20 14:51:09 -04:00

Kconfig

net: wan: slic_ds26522: Allow driver to built if COMPILE_TEST is enabled

2016-10-14 10:11:49 -04:00

lapbether.c

net: Fix inconsistent teardown and release of private netdev state.

2017-06-07 15:53:24 -04:00

Makefile

Maxim/driver: Add driver for maxim ds26522

2016-06-29 04:05:14 -04:00

n2.c

net: use core MTU range checking in WAN drivers

2016-10-20 14:51:09 -04:00

pc300too.c

wan: pc300too: abort path on failure

2017-04-24 15:51:31 -04:00

pci200syn.c

net: use core MTU range checking in WAN drivers

2016-10-20 14:51:09 -04:00

sbni.c

Annotate hardware config module parameters in drivers/net/wan/

2017-04-20 12:02:32 +01:00

sbni.h

…

sdla.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

sealevel.c

Annotate hardware config module parameters in drivers/net/wan/

2017-04-20 12:02:32 +01:00

slic_ds26522.c

net: wan: slic_ds26522: Remove .owner field for driver

2017-02-07 11:41:15 -05:00

slic_ds26522.h

Maxim/driver: Add driver for maxim ds26522

2016-06-29 04:05:14 -04:00

wanxl.c

net: use core MTU range checking in WAN drivers

2016-10-20 14:51:09 -04:00

wanxl.h

…

wanxlfw.inc_shipped

…

wanxlfw.S

…

x25_asy.c

net: use core MTU range checking in WAN drivers

2016-10-20 14:51:09 -04:00

x25_asy.h

wan: Remove extern from function prototypes

2013-09-24 16:40:19 -07:00

z85230.c

Doc: z8530book: Fix typo in API-z8530-sync-txdma-open.html

2015-07-10 23:45:31 -07:00

z85230.h

wan: Remove extern from function prototypes

2013-09-24 16:40:19 -07:00