Benjamin Herrenschmidt a02efb906d Merge commit 'origin' into master ...

Manual merge of:

	arch/powerpc/Kconfig
	arch/powerpc/include/asm/page.h

2008-10-21 15:52:04 +11:00

..

asm

Merge commit 'origin' into master

2008-10-21 15:52:04 +11:00