Merge commit 'paulus-perf/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 9 Jul 2010 01:25:48 +0000 (11:25 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 9 Jul 2010 01:25:48 +0000 (11:25 +1000)

Trivial merge