Merge commit 'kumar/merge' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 15 Jun 2010 04:58:30 +0000 (14:58 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 15 Jun 2010 04:58:30 +0000 (14:58 +1000)

Trivial merge