]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9df9a71 c567d3b)
Merge commit 'c567d3bb9' 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)
commit510903d0ba35a35110378bef7dca77bd5ea89d26
treea8e229f1f5d39e15dac0cb38090e5e06d6602224tree | snapshot
parent9df9a71a33015471325e404b6ca14383af1ab599commit | diff
parentc567d3bb9a35a98233a7590458e2c7d437d7edbccommit | diff
Merge commit 'c567d3bb9' 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
Linux Kernel Source Tree.