Merge branch 'devel-stable' into devel

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

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

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

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

diff --cc arch/arm/mach-at91/Kconfig
Simple merge

diff --cc arch/arm/mach-at91/Makefile
Simple merge

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

diff --cc arch/arm/mm/proc-v7.S
Simple merge