Merge commit 'gcl/merge' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 10 Mar 2009 23:40:29 +0000 (10:40 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 10 Mar 2009 23:40:29 +0000 (10:40 +1100)

Trivial merge