Merge branch 'restart-cleanup' into restart
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Jan 2012 12:56:44 +0000 (12:56 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Jan 2012 12:56:44 +0000 (12:56 +0000)
commit4045407fd7740642b18bc802e8bab064e79a61e5
tree9412a38886bfad562bc5897c6e4c23bb88703204
parent59136ef3c596606d3eef920dc3e0fdfa2ce52c6f
parent4c5f830c4c9d4f19c1eef356c0cd322b46d695c9
Merge branch 'restart-cleanup' into restart

Conflicts:
arch/arm/kernel/setup.c
arch/arm/include/asm/mach/arch.h
arch/arm/kernel/machine_kexec.c
arch/arm/kernel/process.c
arch/arm/kernel/setup.c
arch/arm/plat-mxc/system.c