Merge commit 'kumar/next' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 26 Jun 2009 06:58:01 +0000 (16:58 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 26 Jun 2009 06:58:01 +0000 (16:58 +1000)

Trivial merge