android_kernel_motorola_sm6225/arch/arm/mach-ks8695
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 Merge branch 'late/fixes' into fixes 2012-10-07 07:22:32 -07:00
board-acs5k.c Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
board-dsm320.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-micrel.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-og.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-sg.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
cpu.c ARM: ks8695: use __iomem pointers for MMIO 2012-09-19 15:19:13 +02:00
devices.c ARM: mach-ks8695: remove leds driver, since nobody use it 2012-08-01 11:22:05 +08:00
generic.h ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
irq.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
Kconfig ARM: ks8695: add board support for the OpenGear boards based on the KS8695 2012-09-07 20:16:39 -07:00
Makefile ARM: soc: board specific updates 2012-10-01 18:48:30 -07:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
time.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00