Merge commit 'gcl/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 19 Feb 2010 03:38:23 +0000 (14:38 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 19 Feb 2010 03:38:23 +0000 (14:38 +1100)

Trivial merge