Merge commit 'kumar/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 5 Aug 2010 00:17:29 +0000 (10:17 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 5 Aug 2010 00:17:29 +0000 (10:17 +1000)

Trivial merge