Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 12 Jun 2009 06:53:38 +0000 (16:53 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 12 Jun 2009 06:53:38 +0000 (16:53 +1000)
Manual merge of:
arch/powerpc/kernel/asm-offsets.c


Trivial merge