]> 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)
commit722cca5e387f9a80262285d56dd6614da27699ce
tree9412a38886bfad562bc5897c6e4c23bb88703204
parenta4f555245f5f5a8145d82d095a9e2e19d2d390c1
parent60f9a16df73df73f526fd77e6b36b4e2a29fce9e
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