Merge branch 'lvs-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms...
authorDavid S. Miller <davem@davemloft.net>
Wed, 27 Aug 2008 12:11:26 +0000 (05:11 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 27 Aug 2008 12:11:26 +0000 (05:11 -0700)

Trivial merge