Merge remote branch 'kumar/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 20 May 2011 03:43:47 +0000 (13:43 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 20 May 2011 03:43:47 +0000 (13:43 +1000)

Trivial merge