torvalds-linux/arch/m32r/kernel
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
..
.gitignore
align.c
asm-offsets.c
entry.S
head.S
irq.c
m32r_ksyms.c
Makefile
module.c
process.c
ptrace.c
setup.c
signal.c
smp.c
smpboot.c
sys_m32r.c
syscall_table.S
time.c
traps.c
vmlinux.lds.S