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)

Trivial merge