Merge commit 'gcl/merge' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 18 Mar 2009 02:16:30 +0000 (13:16 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 18 Mar 2009 02:16:30 +0000 (13:16 +1100)

Trivial merge