Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 26 Sep 2015 23:08:27 +0000 (16:08 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 26 Sep 2015 23:08:27 +0000 (16:08 -0700)
commit4963ed48f2c20196d51a447ee87dc2815584fee4
treea1902f466dafa00453889a4f1e66b00249ce0529
parent4d54d86546f62c7c4a0fe3b36a64c5e3b98ce1a9
parent518a7cb6980cd640c7f979d29021ad870f60d7d7
Merge git://git./linux/kernel/git/davem/net

Conflicts:
net/ipv4/arp.c

The net/ipv4/arp.c conflict was one commit adding a new
local variable while another commit was deleting one.

Signed-off-by: David S. Miller <davem@davemloft.net>
26 files changed:
MAINTAINERS
drivers/net/arcnet/arcnet.c
drivers/net/dsa/mv88e6xxx.c
drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
drivers/net/ethernet/broadcom/genet/bcmgenet.c
drivers/net/usb/Kconfig
drivers/net/vrf.c
include/linux/netdevice.h
include/net/route.h
net/bluetooth/smp.c
net/bridge/br_multicast.c
net/core/dev.c
net/core/filter.c
net/core/net-sysfs.c
net/core/rtnetlink.c
net/ipv4/arp.c
net/ipv4/inet_connection_sock.c
net/ipv4/route.c
net/ipv4/tcp_minisocks.c
net/ipv4/tcp_output.c
net/ipv4/xfrm4_policy.c
net/ipv6/addrconf.c
net/ipv6/ip6_output.c
net/ipv6/route.c
net/openvswitch/conntrack.c
net/openvswitch/datapath.c