Searched hist:"77 a87824ed676ca8ff8482e4157d3adb284fd381" (Results 1 – 1 of 1) sorted by relevance
| /linux/arch/arm/mach-clps711x/ |
| H A D | Kconfig | diff 77a87824ed676ca8ff8482e4157d3adb284fd381 Thu Jul 07 05:59:06 CEST 2016 Stephen Rothwell <sfr@canb.auug.org.au> 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>
|