Merge remote branch 'kumar/next' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 21 Jan 2011 00:00:44 +0000 (11:00 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 21 Jan 2011 00:00:44 +0000 (11:00 +1100)

Trivial merge