]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit0f78f6eb366600baa11bdc61f06a59d9645c0bc4
tree40ffc4aa392457e27d6ae9304fa4216db2611f05
parent46b4fac0cfe824e661e48f9b4ffacecb2faca395
parent31267fa71e55f121fd42d99d7c0b14e78f428885
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-2.6
net/netfilter/ipvs/ip_vs_ctl.c