Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs...
authorSimon Horman <horms@verge.net.au>
Wed, 27 Aug 2008 05:11:37 +0000 (15:11 +1000)
committerSimon Horman <horms@verge.net.au>
Wed, 27 Aug 2008 05:11:37 +0000 (15:11 +1000)
commit7fd106785104fa19709fa136abb64c7a9d5db285
tree6002ff3d19af60a5d56faad0276da52fb03174b1
parenta4356b2920fd4861dd6c75f558749fa5c38a00e8
parente3c2ced8d21410e8bc897480081e2ffc516c0f70
Merge branch 'master' of git://git./linux/kernel/git/horms/lvs-2.6 into lvs-next-2.6