Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 23 Jul 2016 23:31:37 +0000 (19:31 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sun, 24 Jul 2016 04:53:32 +0000 (00:53 -0400)
commitde0ba9a0d8909996f9e293d311c2cc459fa77d67
tree199214afc477824bf431d11d08834ff7555c994b
parentd95a93a9b71677a43f967a1b7986decab84b7765
parent107df03203bb66de56e2caec3bde6d22b55480c5
Merge git://git./linux/kernel/git/davem/net

Just several instances of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
43 files changed:
MAINTAINERS
drivers/net/ethernet/agere/et131x.c
drivers/net/ethernet/aurora/nb8800.c
drivers/net/ethernet/broadcom/bgmac.c
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
drivers/net/ethernet/ethoc.c
drivers/net/ethernet/ezchip/nps_enet.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
drivers/net/ethernet/mellanox/mlx4/en_rx.c
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlxsw/reg.h
drivers/net/ethernet/mellanox/mlxsw/spectrum.c
drivers/net/ppp/ppp_generic.c
drivers/net/usb/r8152.c
include/linux/filter.h
include/linux/netdevice.h
include/net/netfilter/nf_conntrack.h
include/net/switchdev.h
kernel/events/core.c
net/8021q/vlan_dev.c
net/batman-adv/bridge_loop_avoidance.c
net/batman-adv/distributed-arp-table.c
net/batman-adv/originator.c
net/batman-adv/routing.c
net/batman-adv/send.c
net/batman-adv/types.h
net/core/filter.c
net/ipv4/tcp_input.c
net/ipv6/udp.c
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_tables_api.c
net/netfilter/nft_meta.c
net/packet/af_packet.c
net/sched/sch_htb.c
net/tipc/bearer.c
net/tipc/bearer.h
net/tipc/link.c
net/tipc/node.c
net/wireless/nl80211.c