tree a8e229f1f5d39e15dac0cb38090e5e06d6602224
parent bca7a5a04933700a8bde4ea5798119607a8b0436
parent 73053d973dd6f56472309cffa5a5d15a62dd6f96
author Russell King <rmk+kernel@arm.linux.org.uk> 1367526046 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1367526197 +0100

Merge commit '73053d973' into smp-hotplug

This is to fix a merge problem with mach-highbank/hotplug.c, which git
silently resolves, but wrongly.  This commit contains the correct
resolution.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>