Searched hist:"77 a87824" (Results 1 – 1 of 1) sorted by relevance
/openbmc/linux/arch/arm/mach-clps711x/ |
H A D | Kconfig | 77a87824 Wed Jul 06 22:59:06 CDT 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> 77a87824 Wed Jul 06 22:59:06 CDT 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>
|