Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-19 02:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
4227961650
linux/arch/arm/mach-sa1100
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 Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2012-10-07 21:20:57 +09:00
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 ARM: sa1100: clean up clock support 2012-02-28 10:08:07 +08:00
collie.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
cpu-sa1100.c ARM: sa11x0/pxa: convert OS timer registers to IOMEM 2012-07-09 17:37:35 +01:00
cpu-sa1110.c ARM: sa11x0/pxa: convert OS timer registers to IOMEM 2012-07-09 17:37:35 +01:00
generic.c Merge branch 'clean/late_initcall_v2' of git://git.linaro.org/people/shawnguo/linux-2.6 into staging/cleanup 2012-05-11 00:49:56 -07:00
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 ARM: sa11x0/pxa: convert OS timer registers to IOMEM 2012-07-09 17:37:35 +01:00
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 ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
lart.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
Makefile ARM: mach-sa1100: retire custom LED code 2012-08-01 11:22:14 +08:00
Makefile.boot ARM: sa1100: fix build error 2011-12-08 14:55:57 +08:00
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 ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
pleb.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
pm.c ARM: sa11x0/pxa: convert OS timer registers to IOMEM 2012-07-09 17:37:35 +01:00
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 ARM: 7452/1: delay: allow timer-based delay implementation to be selected 2012-07-09 17:42:23 +01:00
ssp.c ARM: 7342/2: sa1100: prepare for sparse irq conversion 2012-03-25 23:57:20 +01:00
time.c Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00