torvalds-linux/arch/arm/mach-sa1100
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
assabet.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
badge4.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
cerf.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
clock.c
collie.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
cpu-sa1100.c
cpu-sa1110.c
generic.c
generic.h ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
h3xxx.c ARM: move serial_sa1100.h header file to linux/platform_data 2012-11-16 11:35:29 +00:00
h3100.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
h3600.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
hackkit.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
irq.c
jornada720_ssp.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
jornada720.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
Kconfig
lart.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
Makefile
Makefile.boot
nanoengine.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
neponset.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
pci-nanoengine.c
pleb.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
pm.c
shannon.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
simpad.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
sleep.S
ssp.c
time.c Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00