Merge branch 'lvs-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms...
David S. Miller [Wed, 10 Sep 2008 02:51:04 +0000 (19:51 -0700)]

Trivial merge