tree 933425fddb23d28be802277471df3fe3f6c2711d
parent 00c82d64405631967dca3890a9ce80ab35d04cc7
parent 77cc982f6a3b33a5aa058ad3b20cda8866db2948
author Olof Johansson <olof@lixom.net> 1358187602 -0800
committer Olof Johansson <olof@lixom.net> 1358187602 -0800

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