Merge remote branch 'gcl/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 9 Aug 2010 01:23:58 +0000 (11:23 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 9 Aug 2010 01:23:58 +0000 (11:23 +1000)

Trivial merge