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

..

appletalk

…

arcnet

…

bonding

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

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

caif

…

can

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

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

cris

…

dsa

net: dsa: Remove master_netdev and use dst->cpu_dp->netdev

2017-06-13 16:35:02 -04:00

ethernet

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

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

fddi

…

fjes

fjes: remove duplicate set of flag IFF_BROADCAST

2017-06-13 13:54:51 -04:00

hamradio

…

hippi

…

hyperv

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

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

ieee802154

…

ipvlan

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

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

irda

…

phy

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

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

plip

…

ppp

…

slip

…

team

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

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

usb

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

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

vmxnet3

…

wan

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

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

wimax

…

wireless

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

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

xen-netback

…

dummy.c

…

eql.c

…

geneve.c

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

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

gtp.c

…

ifb.c

…

Kconfig

…

LICENSE.SRC

…

loopback.c

…

macsec.c

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

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

macvlan.c

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

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

macvtap.c

…

Makefile

…

mdio.c

…

mii.c

…

netconsole.c

netconsole: Remove duplicate "netconsole: " logging prefix

2017-06-13 12:57:40 -04:00

nlmon.c

…

ntb_netdev.c

…

rionet.c

…

sb1000.c

…

Space.c

…

sungem_phy.c

drivers/net/sungem: add const to mii_phy_ops structures

2017-06-08 15:32:47 -04:00

tap.c

…

tun.c

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

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

veth.c

…

virtio_net.c

…

vrf.c

net: vrf: Make add_fib_rules per network namespace flag

2017-06-08 19:27:42 -04:00

vsockmon.c

…

vxlan.c

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

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

xen-netfront.c

…