Merge commit 'kumar/kumar-merge' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 28 Jan 2009 06:14:54 +0000 (17:14 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 28 Jan 2009 06:14:54 +0000 (17:14 +1100)

Trivial merge