Merge commit 'kumar/merge' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 11 Nov 2009 04:43:25 +0000 (15:43 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 11 Nov 2009 04:43:25 +0000 (15:43 +1100)

Trivial merge