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

diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge

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

diff --cc drivers/net/vxlan.c
Simple merge

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

diff --cc net/packet/af_packet.c
Simple merge