From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 2 May 2013 20:20:46 +0000 (+0100)
Subject: Merge commit '73053d973' into smp-hotplug
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~51^2~1^6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e45a0a1975df83fc068349e6a31fdf6af61a458;p=pandora-kernel.git

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>
---

5e45a0a1975df83fc068349e6a31fdf6af61a458
Reading git-diff-tree failed