Merge commit 'origin/master' into next

Manual merge of:
	arch/powerpc/include/asm/pgtable-ppc32.h