Merge commit 'kumar/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 30 Mar 2009 02:46:19 +0000 (13:46 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 30 Mar 2009 02:46:19 +0000 (13:46 +1100)

Trivial merge