Merge branch 'nf' of git://1984.lsi.us.es/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 17 Oct 2011 23:38:03 +0000 (19:38 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 17 Oct 2011 23:38:03 +0000 (19:38 -0400)
commitae2a4583154a5b985ed4a81c6259c55bafe6d810
treefcfcecfb03924eb1f4368c4aaee83d7d36bf6df0
parent7f81e25befdfb3272345a2e775f520e1d515fa20
parentae1d48b23d5e79efbcf0cef4f0ebb9742361af59
Merge branch 'nf' of git://1984.lsi.us.es/net
net/netfilter/ipvs/ip_vs_ctl.c