Olof Johansson 8d84981e39 Merge branch 'clocksource/cleanup' into next/cleanup ... Clockevent cleanup series from Shawn Guo. Resolved move/change conflict in mach-pxa/time.c due to the sys_timer cleanup. * clocksource/cleanup: clocksource: use clockevents_config_and_register() where possible ARM: use clockevents_config_and_register() where possible clockevents: export clockevents_config_and_register for module use + sync to Linux 3.8-rc3 Signed-off-by: Olof Johansson <olof@lixom.net> Conflicts: arch/arm/mach-pxa/time.c		2013-01-14 10:20:02 -08:00
..
include/mach	ARM: soc: multiplatform enablement	2012-10-01 19:11:38 -07:00
icoll.c	ARM: mxs: adopt irq_domain support for icoll driver	2012-09-03 09:32:02 +08:00
Kconfig	ARM: mxs: remove platform device codes	2012-08-17 12:35:45 +08:00
mach-mxs.c	ARM: delete struct sys_timer	2012-12-24 09:36:38 -07:00
Makefile	ARM: mxs: remove iomux driver	2012-08-17 12:35:55 +08:00
Makefile.boot	ARM: move all dtb targets out of Makefile.boot	2012-09-14 09:22:04 -05:00
mm.c	ARM: mxs: remove non-DT core functions	2012-08-17 12:35:38 +08:00
ocotp.c	arm: mxs: include asm/processor.h for cpu_relax()	2011-06-06 09:50:04 +02:00
pm.c	ARM: substitute arch_idle()	2012-01-20 18:55:19 -05:00
system.c	ARM: mxs: remove old clock support	2012-05-09 00:02:42 +08:00
timer.c	ARM: use clockevents_config_and_register() where possible	2013-01-14 10:12:42 -08:00