alex/torvalds-linux
1
0
Fork 0
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-23 00:15:24 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
87e4ee759f
torvalds-linux/arch/arm/mach-dove
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
addr-map.c
cm-a510.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
common.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
common.h ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
dove-db-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
irq.c
Kconfig
Makefile
Makefile.boot
mpp.c
mpp.h
pcie.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00