Merge branches 'fixes' and 'ioremap' into for-linus

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
Simple merge

diff --cc arch/arm/include/asm/memory.h
Simple merge

diff --cc arch/arm/kernel/entry-armv.S
Simple merge

diff --cc arch/arm/kernel/smp.c
Simple merge

diff --cc arch/arm/mm/mmu.c
Simple merge