projects / platform / kernel / linux-amlogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bca7a5a 73053d9)
Merge commit '73053d973' into smp-hotplug
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 2 May 2013 20:20:46 +0000 (21:20 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 2 May 2013 20:23:17 +0000 (21:23 +0100)
commit5e45a0a1975df83fc068349e6a31fdf6af61a458
treea8e229f1f5d39e15dac0cb38090e5e06d6602224tree | snapshot
parentbca7a5a04933700a8bde4ea5798119607a8b0436commit | diff
parent73053d973dd6f56472309cffa5a5d15a62dd6f96commit | diff
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>
arch/arm/mach-highbank/hotplug.c diff1 | diff2 | blob | history
Domain: System / Kernel;