tree 97ad3cb7e3443f09fbe55f57d3c36994b20a8e52
parent 23beab76b490172a9ff3d52843e4d27a35b2a4c6
parent 865a4fae7793b80e2b8bca76e279d6dfecbeac17
author Russell King <rmk+kernel@arm.linux.org.uk> 1287437687 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1287437687 +0100

Merge branch 'hotplug' into devel

Conflicts:
	arch/arm/kernel/head-common.S