Merge remote-tracking branch 'kumar/next' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 2 Apr 2012 03:57:46 +0000 (13:57 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 2 Apr 2012 03:57:46 +0000 (13:57 +1000)

Trivial merge