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

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

diff --cc drivers/net/ethernet/mellanox/mlx4/en_cq.c
Simple merge

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

diff --cc net/netfilter/ipvs/ip_vs_ctl.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_sync.c
Simple merge

diff --cc net/netfilter/nf_conntrack_netlink.c
Simple merge