Merge commit 'jk/jk-merge'
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 25 Jul 2008 05:35:10 +0000 (15:35 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 25 Jul 2008 05:35:10 +0000 (15:35 +1000)

Trivial merge