Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 29 Jul 2011 01:38:53 +0000 (18:38 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 29 Jul 2011 01:38:53 +0000 (18:38 -0700)
commit384b90abeba71579e0601ff434e3ea40c15057f0
tree40ffc4aa392457e27d6ae9304fa4216db2611f05
parent9e8f90dfe58eb19140bc66655170c7aef9eadbf2
parent7676e345824f162191b1fe2058ad948a6cf91c20
Merge branch 'master' of git://git./linux/kernel/git/horms/ipvs-2.6
net/netfilter/ipvs/ip_vs_ctl.c