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
..
boot	m32r: make memset() global for CONFIG_KERNEL_BZIP2=y	2012-07-17 16:21:30 -07:00
configs	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
include	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-12-20 18:05:28 -08:00
kernel	Merge branch 'clocksource/cleanup' into next/cleanup	2013-01-14 10:20:02 -08:00
lib	m32r: export delay loop symbols	2009-10-04 12:02:36 +09:00
mm	Disintegrate asm/system.h for M32R	2012-03-28 18:30:02 +01:00
oprofile	oprofile: more whitespace fixes	2008-10-15 20:55:51 +02:00
platforms	Disintegrate asm/system.h for M32R	2012-03-28 18:30:02 +01:00
Kconfig	Bury the conditionals from kernel_thread/kernel_execve series	2012-12-19 18:07:38 -05:00
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Makefile	m32r: Use generic init_task	2012-05-05 13:00:23 +02:00