Merge commit 'jk/jk-merge'
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 10 Oct 2008 04:56:16 +0000 (15:56 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 10 Oct 2008 04:56:16 +0000 (15:56 +1100)

Trivial merge