]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 792a553) | 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)
commit44887b94ff51cf633fc1cf1bc2ae460c91772ba2
treeeca062e0d63648cfce1be4b6ae0257f3248bb28ftree | snapshot
parent792a5530e3003c9bc2e04649bc546ebbd43472afcommit | diff
clocksource/drivers/clps_711x: fixup for "ARM: clps711x:

 Switch to MULTIPLATFORM"

Missed conflict between commit f9f2453e1a41 ("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
Linux Kernel Source Tree.