torvalds-linux/arch/arm/mach-mmp
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
..
include/mach
aspenite.c
avengers_lite.c
brownstone.c
clock-mmp2.c
clock-pxa168.c
clock-pxa910.c
clock.c
clock.h
common.c
common.h
devices.c
flint.c
gplugd.c
irq.c
jasper.c
Kconfig
Makefile
Makefile.boot
mmp2-dt.c
mmp2.c
mmp-dt.c
pm-mmp2.c
pm-pxa910.c
pxa168.c
pxa910.c
sram.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
tavorevb.c
teton_bga.c
time.c ARM: use clockevents_config_and_register() where possible 2013-01-14 10:12:42 -08:00
ttc_dkb.c