Merge remote branch 'kumar/merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 13 Oct 2010 05:18:36 +0000 (16:18 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 13 Oct 2010 05:18:36 +0000 (16:18 +1100)

Trivial merge