Merge commit 'kumar/kumar-next'
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 30 Jul 2008 04:36:03 +0000 (14:36 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 30 Jul 2008 04:36:03 +0000 (14:36 +1000)

Trivial merge