torvalds-linux/arch/arm/mach-w90x900
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
clksel.c
clock.c
clock.h
cpu.c
cpu.h
dev.c
gpio.c
irq.c
Kconfig
mach-nuc910evb.c
mach-nuc950evb.c
mach-nuc960evb.c
Makefile
Makefile.boot
mfp.c
nuc9xx.h
nuc910.c
nuc910.h
nuc950.c
nuc950.h
nuc960.c
nuc960.h
time.c Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00