Merge commit 'kumar/merge' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 13 May 2010 01:42:40 +0000 (11:42 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 13 May 2010 01:42:40 +0000 (11:42 +1000)

Trivial merge