Merge commit 'kumar/next' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 9 Mar 2010 00:51:57 +0000 (11:51 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 9 Mar 2010 00:51:57 +0000 (11:51 +1100)

Trivial merge