Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git

diff --cc CREDITS
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/include/asm/io.h
Simple merge

diff --cc arch/powerpc/kernel/time.c
Simple merge

diff --cc arch/powerpc/mm/ioremap.c
Simple merge

diff --cc arch/powerpc/mm/mem.c
Simple merge

diff --cc kernel/irq/Kconfig
Simple merge