Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-29 03:13:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
8d84981e39
linux/arch/arm/mach-versatile
History
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 ARM: 7610/1: versatile: bump IRQ numbers 2013-01-02 10:35:06 +00:00
core.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
core.h ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
Kconfig ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
Makefile arm/versatile: Add device tree support 2011-07-28 01:32:04 -06:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
pci.c ARM: versatile: use fixed PCI i/o mapping 2012-07-26 09:09:56 -05:00
versatile_ab.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
versatile_dt.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
versatile_pb.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00