Merge remote branch 'kumar/merge' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 5 Apr 2011 06:20:22 +0000 (16:20 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 5 Apr 2011 06:20:22 +0000 (16:20 +1000)

Trivial merge