Russell King 5e45a0a197 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>
2013-05-02 21:23:17 +01:00
..
2013-04-11 16:55:29 +02:00
2013-03-18 08:17:14 -07:00
2013-02-28 20:09:24 -08:00
2013-02-21 14:58:40 -08:00
2013-02-21 15:27:22 -08:00
2013-02-21 14:58:40 -08:00
2013-02-28 20:00:40 -08:00
2013-02-21 15:40:16 -08:00