Merge commit 'kumar/kumar-next'
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 13 Oct 2008 23:11:38 +0000 (10:11 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 13 Oct 2008 23:11:38 +0000 (10:11 +1100)

Trivial merge