git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic

author	David S. Miller <davem@davemloft.net>
	Mon, 2 Jan 2012 23:56:49 +0000 (18:56 -0500)
committer	David S. Miller <davem@davemloft.net>
	Mon, 2 Jan 2012 23:56:49 +0000 (18:56 -0500)
commit	455ffa607f0efa90c9fec99604553b7cdd5274b2
tree	6ff12c853b4a26612ceea8191a8eae29b130b670	tree \| snapshot (tar.gz zip)
parent	3ab0b245aa550ea4670d096092ca8e8d5e14ac89	commit \| diff
parent	115e8e705e4be071b9e06ff72578e3b603f2ba65	commit \| diff

Merge git://git./linux/kernel/git/davem/net

drivers/net/ethernet/marvell/skge.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/en_cq.c	diff1 \|	diff2 \|	blob \| history
include/net/ip_vs.h	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_ctl.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_sync.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_netlink.c	diff1 \|	diff2 \|	blob \| history