Merge branch 'restart' into for-next

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

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

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

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

diff --cc arch/arm/mach-mxs/mach-mx28evk.c
Simple merge

diff --cc arch/arm/mach-tegra/board-dt.c
Simple merge