linux_dsm_epyc7002/arch/arm/mach-footbridge
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
cats-hw.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
cats-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
common.c ARM: footbridge: use fixed PCI i/o mapping 2012-07-26 09:09:59 -05:00
common.h ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
dc21285-timer.c Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
dc21285.c ARM: footbridge: use fixed PCI i/o mapping 2012-07-26 09:09:59 -05:00
dma.c Merge branch 'dma' into devel 2009-02-21 21:42:50 +00:00
ebsa285-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
ebsa285.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
isa-irq.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
isa-rtc.c ARM: footbridge: trim down old ISA rtc setup 2009-12-24 13:39:18 +00:00
isa-timer.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
isa.c ARM: footbridge: trim down old ISA rtc setup 2009-12-24 13:39:18 +00:00
Kconfig ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
Makefile ARM: mach-footbridge: retire custom LED code 2012-08-01 11:22:10 +08:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
netwinder-hw.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
netwinder-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
personal-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
personal.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00