Merge branches 'fixes', 'mcpm', 'misc' and 'mmci' into for-next

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/boot/compressed/head.S
Simple merge

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

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

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

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