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

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 3a353091a903..67604e599384 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -134,7 +134,7 @@ config DEBUG_SECTION_MISMATCH
           any use of code/data previously in these sections would
           most likely result in an oops.
           In the code, functions and variables are annotated with
-          __init, __devinit, etc. (see the full list in include/linux/init.h),
+          __init, __cpuinit, etc. (see the full list in include/linux/init.h),
           which results in the code/data being placed in specific sections.
           The section mismatch analysis is always performed after a full
           kernel build, and enabling this option causes the following