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)
commit455ffa607f0efa90c9fec99604553b7cdd5274b2
tree6ff12c853b4a26612ceea8191a8eae29b130b670
parent3ab0b245aa550ea4670d096092ca8e8d5e14ac89
parent115e8e705e4be071b9e06ff72578e3b603f2ba65
Merge git://git./linux/kernel/git/davem/net
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