Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-2.6
authorPatrick McHardy <kaber@trash.net>
Thu, 16 Jun 2011 15:09:54 +0000 (17:09 +0200)
committerPatrick McHardy <kaber@trash.net>
Thu, 16 Jun 2011 15:09:54 +0000 (17:09 +0200)
commit122c4f10f7b66f9c7a0177de668e9662b0b14a05
treec30c5b546651fb97eb7ce1867e24091fadf28447
parent264524d5e5195f6e0f099bee20253a22b651e272
parent8f4e0a18682d91abfad72ede3d3cb5f3ebdf54b4
Merge branch 'master' of git://git./linux/kernel/git/horms/ipvs-2.6