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

Signed-off-by: David S. Miller <davem@davemloft.net>

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

diff --cc drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
Simple merge

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

diff --cc include/net/ipv6.h
Simple merge

diff --cc net/bridge/br_fdb.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/rtnetlink.c
Simple merge

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

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