]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit7266309ccdf54ec76d319bfa6366bc6743085422
tree9412a38886bfad562bc5897c6e4c23bb88703204
parent9d5731fcec0033d482c4cc00671fa06d251bb832
parent5c7c576d8964e38a06bdb9540aefc4f23b1f81d4
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