Merge commit 'jwb/merge' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 8 Jul 2009 03:49:38 +0000 (13:49 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 8 Jul 2009 03:49:38 +0000 (13:49 +1000)

Trivial merge