Merge remote-tracking branch 'kumar/merge' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 23 Apr 2012 00:55:20 +0000 (10:55 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 23 Apr 2012 00:55:20 +0000 (10:55 +1000)

Trivial merge