Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 1 Nov 2015 04:15:30 +0000 (00:15 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sun, 1 Nov 2015 04:15:30 +0000 (00:15 -0400)
commitb75ec3af27bf011a760e2f44eb25a99b6fbb0fb3
tree89f4fbab2c6194b32a46eb771c4b158585bf0bb5
parente7b63ff115f21ea6c609cbb08f3d489af627af6e
parent523e13455ec9ec4457a5a1d24ff7132949742b70
Merge git://git./linux/kernel/git/davem/net
12 files changed:
MAINTAINERS
drivers/net/ethernet/amd/xgbe/xgbe-dev.c
drivers/net/ethernet/amd/xgbe/xgbe-drv.c
drivers/net/ethernet/freescale/gianfar.c
drivers/net/ethernet/freescale/gianfar_ethtool.c
drivers/net/ethernet/marvell/mv643xx_eth.c
drivers/net/wireless/ath/ath6kl/init.c
net/ipv6/ip6_output.c
net/ipv6/netfilter/nf_conntrack_reasm.c
net/openvswitch/actions.c
net/openvswitch/conntrack.c
samples/bpf/bpf_helpers.h