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)
commita0a55682b83fd5f012afadcf415b030d7424ae68
tree97ad3cb7e3443f09fbe55f57d3c36994b20a8e52
parent23beab76b490172a9ff3d52843e4d27a35b2a4c6
parent865a4fae7793b80e2b8bca76e279d6dfecbeac17
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