Merge branch 'merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 19 May 2011 07:00:06 +0000 (17:00 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 19 May 2011 07:00:06 +0000 (17:00 +1000)

Trivial merge