Merge branch 'merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 29 May 2009 03:54:52 +0000 (13:54 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 29 May 2009 03:54:52 +0000 (13:54 +1000)

Trivial merge