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	Merge branch 'cleanup/__iomem' into next/cleanup	2012-09-22 10:24:29 -07:00
io.c	Merge branch 'cleanup/__iomem' into next/cleanup	2012-09-22 10:24:29 -07:00
iq81340mc.c	ARM: delete struct sys_timer	2012-12-24 09:36:38 -07:00
iq81340sc.c	ARM: delete struct sys_timer	2012-12-24 09:36:38 -07:00
irq.c
Kconfig
Makefile
Makefile.boot
msi.c
pci.c	ARM: drivers: remove __dev* attributes.	2013-01-03 15:57:04 -08:00
pci.h
setup.c	Merge branch 'cleanup/__iomem' into next/cleanup	2012-09-22 10:24:29 -07:00
tpmi.c