Merge commit 'gcl/merge' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 27 Oct 2009 22:56:18 +0000 (09:56 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 27 Oct 2009 22:56:18 +0000 (09:56 +1100)

Trivial merge