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
..
arch-v10	time: convert arch_gettimeoffset to a pointer	2012-12-24 09:36:07 -07:00
arch-v32	ARCH: drivers remove __dev* attributes.	2013-01-03 15:57:13 -08:00
boot
configs
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	time: convert arch_gettimeoffset to a pointer	2012-12-24 09:36:07 -07:00
mm
Kconfig	Bury the conditionals from kernel_thread/kernel_execve series	2012-12-19 18:07:38 -05:00
Kconfig.debug
Makefile