From: Olof Johansson <olof@lixom.net>
Date: Mon, 14 Jan 2013 18:20:02 +0000 (-0800)
Subject: Merge branch 'clocksource/cleanup' into next/cleanup
X-Git-Tag: v3.9-rc1~122^2~29
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d84981e395850aab31c3f2ca7e2738e03f671d7;p=pandora-kernel.git

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
---

8d84981e395850aab31c3f2ca7e2738e03f671d7
Reading git-diff-tree failed