Merge remote-tracking branch 'kumar/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 25 Nov 2011 04:25:39 +0000 (15:25 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 25 Nov 2011 04:25:39 +0000 (15:25 +1100)

Trivial merge