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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/amd/xgbe/xgbe-dev.c
Simple merge

diff --cc drivers/net/ethernet/amd/xgbe/xgbe-drv.c
Simple merge

diff --cc drivers/net/ethernet/freescale/gianfar.c
Simple merge

diff --cc drivers/net/ethernet/freescale/gianfar_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mv643xx_eth.c
Simple merge

diff --cc drivers/net/wireless/ath/ath6kl/init.c
Simple merge

diff --cc net/ipv6/ip6_output.c
Simple merge

diff --cc net/ipv6/netfilter/nf_conntrack_reasm.c
Simple merge

diff --cc net/openvswitch/actions.c
Simple merge

diff --cc net/openvswitch/conntrack.c
Simple merge

diff --cc samples/bpf/bpf_helpers.h
Simple merge