Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 2 Jan 2012 23:56:49 +0000 (18:56 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 2 Jan 2012 23:56:49 +0000 (18:56 -0500)
1  2 
drivers/net/ethernet/marvell/skge.c
drivers/net/ethernet/mellanox/mlx4/en_cq.c
include/net/ip_vs.h
net/netfilter/ipvs/ip_vs_ctl.c
net/netfilter/ipvs/ip_vs_sync.c
net/netfilter/nf_conntrack_netlink.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge