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: nomadik: bump the IRQ numbers again	2013-01-03 23:42:07 +01:00
board-nhk8815.c	Merge branch 'clocksource/cleanup' into next/cleanup	2013-01-14 10:20:02 -08:00
cpu-8815.c	pinctrl/nomadik: move the platform data header	2012-11-05 09:55:27 +01:00
cpu-8815.h	ARM: restart: nomadik: use new restart hook	2012-01-05 12:57:16 +00:00
i2c-8815nhk.c	pinctrl/nomadik: merge old pincfg header	2012-11-05 09:55:29 +01:00
Kconfig	ARM: plat-nomadik: move MTU, kill plat-nomadik	2012-11-05 09:55:33 +01:00
Makefile	ARM: nomadik: convert to generic clock	2012-06-10 18:41:40 +02:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00