Merge commit 'kumar/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 27 Aug 2009 03:13:41 +0000 (13:13 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 27 Aug 2009 03:13:41 +0000 (13:13 +1000)

Trivial merge