Merge branch 'clocksource/cleanup' into next/cleanup
authorOlof Johansson <olof@lixom.net>
Mon, 14 Jan 2013 18:20:02 +0000 (10:20 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 14 Jan 2013 18:20:02 +0000 (10:20 -0800)
commit8d84981e395850aab31c3f2ca7e2738e03f671d7
tree933425fddb23d28be802277471df3fe3f6c2711d
parent00c82d64405631967dca3890a9ce80ab35d04cc7
parent77cc982f6a3b33a5aa058ad3b20cda8866db2948
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
26 files changed:
arch/arm/mach-at91/at91rm9200_time.c
arch/arm/mach-cns3xxx/core.c
arch/arm/mach-davinci/board-dm646x-evm.c
arch/arm/mach-exynos/mct.c
arch/arm/mach-footbridge/dc21285-timer.c
arch/arm/mach-highbank/highbank.c
arch/arm/mach-ixp4xx/common.c
arch/arm/mach-kirkwood/board-dt.c
arch/arm/mach-ks8695/board-acs5k.c
arch/arm/mach-lpc32xx/timer.c
arch/arm/mach-msm/timer.c
arch/arm/mach-netx/time.c
arch/arm/mach-nomadik/board-nhk8815.c
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap1/time.c
arch/arm/mach-omap2/timer.c
arch/arm/mach-prima2/timer.c
arch/arm/mach-pxa/time.c
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-sa1100/time.c
arch/arm/mach-tegra/timer.c
arch/arm/mach-ux500/cpu-db8500.c
arch/arm/mach-w90x900/time.c
arch/arm/plat-samsung/include/plat/cpu.h
arch/arm/plat-samsung/s5p-time.c
drivers/clocksource/sunxi_timer.c