Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 18 Feb 2009 02:19:25 +0000 (13:19 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 18 Feb 2009 02:19:25 +0000 (13:19 +1100)
Manual merge of:
arch/powerpc/include/asm/pgtable-ppc32.h


Trivial merge