maxmustermann/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
linux/arch/arm/mach-ux500
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
board-mop500-audio.c ARM: arm-soc: multiplatform conversion patches 2012-12-13 10:57:16 -08:00
board-mop500-pins.c ARM: arm-soc: driver specific changes 2012-12-13 10:59:11 -08:00
board-mop500-regulators.c
board-mop500-regulators.h
board-mop500-sdi.c ARM: plat-nomadik: move DMA40 header to <linux/platform_data> 2012-11-05 09:55:32 +01:00
board-mop500-stuib.c Input: bu21013_ts - move GPIO init and exit functions into the driver 2012-11-27 23:05:11 -08:00
board-mop500-u8500uib.c
board-mop500-uib.c
board-mop500.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-mop500.h ARM: ux500: Stop registering the PCM driver from platform code 2012-11-27 10:58:38 +00:00
cache-l2x0.c
cpu-db8500.c Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
cpu.c ARM: ux500: Fix initialisation order for UIBs 2012-11-01 12:59:21 +01:00
cpuidle.c
devices-common.c ARM: plat-nomadik: convert platforms to SPARSE_IRQ 2012-11-05 09:55:34 +01:00
devices-common.h ARM: ux500: add PRCM register base for pinctrl 2012-11-08 13:44:41 +01:00
devices-db8500.c ARM: plat-nomadik: convert platforms to SPARSE_IRQ 2012-11-05 09:55:34 +01:00
devices-db8500.h ARM: ux500: fix missing include 2012-12-17 10:04:30 -08:00
devices.c
headsmp.S
hotplug.c ARM: consolidate pen_release instead of having per platform definitions 2012-09-14 11:15:01 +02:00
id.c
Kconfig ARM: plat-nomadik: move MTU, kill plat-nomadik 2012-11-05 09:55:33 +01:00
Makefile Merge branch 'for-arm-soc-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt 2012-09-22 22:20:37 -07:00
Makefile.boot ARM: move all dtb targets out of Makefile.boot 2012-09-14 09:22:04 -05:00
pins-db8500.h
platsmp.c Merge branch 'multiplatform/smp_ops' into next/multiplatform 2012-09-22 00:16:04 -07:00
ste-dma40-db8500.h
timer.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
usb.c ARM: plat-nomadik: move DMA40 header to <linux/platform_data> 2012-11-05 09:55:32 +01:00