Stephen Rothwell 77a87824ed clocksource/drivers/clps_711x: fixup for "ARM: clps711x: ... Switch to MULTIPLATFORM" Missed conflict between commit c86f51737f ("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>		2016-08-01 21:25:20 -04:00
..
board-autcpu12.c	gpio: generic: factor into gpio_chip struct	2016-01-05 11:21:00 +01:00
board-cdb89712.c	cleanup IORESOURCE_CACHEABLE vs ioremap()	2015-08-10 23:07:06 -04:00
board-clep7312.c	ARM: clps711x: clep7312: Add common devices initialization	2014-07-06 16:52:20 -07:00
board-dt.c	ARM: clps711x: Add basic DT support	2016-07-06 17:38:54 +02:00
board-edb7211.c	ARM: clps711x: edb7211: Use new PWM driver for backlight	2014-09-04 21:39:53 +02:00
board-p720t.c	gpio: generic: factor into gpio_chip struct	2016-01-05 11:21:00 +01:00
common.c	ARM: clps711x: Reduce static map size	2016-07-06 17:38:52 +02:00
common.h	ARM: clps711x: Switch CLPS711X subarch to use clk and clocksource driver	2014-09-04 21:36:08 +02:00
devices.c	ARM: clps711x: Add SOC BUS support	2014-09-04 21:40:43 +02:00
devices.h	ARM: clps711x: Re-add GPIO support	2013-06-11 15:44:57 -07:00
Kconfig	clocksource/drivers/clps_711x: fixup for "ARM: clps711x:	2016-08-01 21:25:20 -04:00
Makefile	ARM: clps711x: Switch to MULTIPLATFORM	2016-07-06 17:57:56 +02:00
Makefile.boot	ARM: clps711x: Remove boards support	2016-07-06 17:57:55 +02:00