projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e48af7a) | patch
clocksource/drivers/clps_711x: fixup for "ARM: clps711x:
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 7 Jul 2016 03:59:06 +0000 (13:59 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Aug 2016 01:25:20 +0000 (21:25 -0400)
commit77a87824ed676ca8ff8482e4157d3adb284fd381
treeeca062e0d63648cfce1be4b6ae0257f3248bb28ftree | snapshot
parente48af7aaf1e6d266414b11540339e6d2dac20ad2commit | diff
clocksource/drivers/clps_711x: fixup for "ARM: clps711x:

 Switch to MULTIPLATFORM"

Missed conflict between commit c86f51737f8d ("ARM: clps711x: Switch to
MULTIPLATFORM") from the arm-soc tree and commit 250e46aa3bb3
("clocksource/drivers/clps_711x: Add the COMPILE_TEST option") from the
clockevents tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/arm/mach-clps711x/Kconfig diff | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git