]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'hotplug' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 18 Oct 2010 21:34:47 +0000 (22:34 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 18 Oct 2010 21:34:47 +0000 (22:34 +0100)
commita0318f227710d23a3e44e94949dc1e285c966428
tree97ad3cb7e3443f09fbe55f57d3c36994b20a8e52
parentc3d716534aab267d9e388a054f4998487f9031a9
parentabc346bcdfd565d8fb1230a1cc3d5b19f6cd5f5d
Merge branch 'hotplug' into devel

Conflicts:
arch/arm/kernel/head-common.S
arch/arm/kernel/head-common.S
arch/arm/kernel/head.S
arch/arm/kernel/smp.c
arch/arm/kernel/vmlinux.lds.S
arch/arm/mm/proc-v6.S
arch/arm/mm/proc-v7.S