Merge branch 'devel-stable' into for-next

diff --cc arch/arm/Kconfig
Simple merge

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

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

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

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