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: vexpress: Start using new Versatile Express infrastructure	2012-11-05 17:09:51 +00:00
core.h	ARM: SoC: convert VExpress/RealView to SMP operations	2012-09-13 15:34:50 +02:00
ct-ca9x4.c	ARM: vexpress: Start using new Versatile Express infrastructure	2012-11-05 17:09:51 +00:00
hotplug.c	ARM: consolidate pen_release instead of having per platform definitions	2012-09-14 11:15:01 +02:00
Kconfig	ARM: 7609/1: disable errata work-arounds which access secure registers	2013-01-02 10:35:05 +00:00
Makefile	ARM: vexpress: Start using new Versatile Express infrastructure	2012-11-05 17:09:51 +00:00
platsmp.c	ARM: vexpress: Start using new Versatile Express infrastructure	2012-11-05 17:09:51 +00:00
reset.c	ARM: vexpress: Reset driver	2012-10-18 17:58:47 +01:00
v2m.c	ARM: delete struct sys_timer	2012-12-24 09:36:38 -07:00