leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
877cd95316
linux/arch/arm/mach-ixp4xx
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: delete struct sys_timer 2012-12-24 09:36:38 -07:00
avila-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
avila-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
common-pci.c IXP4xx: Remove time limit for PCI TRDY to enable use of slow devices. 2012-11-22 03:35:58 +00:00
common.c Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
coyote-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
coyote-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
dsmg600-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
dsmg600-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
fsg-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
fsg-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
gateway7001-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
gateway7001-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
goramo_mlr.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
gtwx5715-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
gtwx5715-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
ixdp425-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
ixdp425-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
ixdpg425-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
ixp4xx_npe.c ixp4xx: Declare MODULE_FIRMWARE usage 2012-11-22 03:36:22 +00:00
ixp4xx_qmgr.c IXP4xx: use __iomem for MMIO 2012-11-22 03:36:45 +00:00
Kconfig ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
Makefile ixp4xx: support omicron ixp425 based boards 2011-09-30 22:18:42 +02:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
miccpt-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
nas100d-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
nas100d-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
nslu2-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
nslu2-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
omixp-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
vulcan-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
vulcan-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
wg302v2-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
wg302v2-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00