Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
authorJon Hunter <jon-hunter@ti.com>
Mon, 1 Apr 2013 18:47:29 +0000 (13:47 -0500)
committerJon Hunter <jon-hunter@ti.com>
Mon, 1 Apr 2013 18:47:29 +0000 (13:47 -0500)
commit2d61aecee8f32259920cdf90a452fa26ffc64e9f
tree2311b6b4c12b946164e8cfb3422cebdfecf08f37
parent71856843fb1d8ee455a4c1a60696c74afa4809e5
parent6bb27d7349db51b50c40534710fe164ca0d58902
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
14 files changed:
arch/arm/mach-davinci/board-dm646x-evm.c
arch/arm/mach-highbank/highbank.c
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-kirkwood/board-dt.c
arch/arm/mach-ks8695/board-acs5k.c
arch/arm/mach-nomadik/board-nhk8815.c
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/timer.c
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-ux500/cpu-db8500.c
arch/arm/plat-samsung/include/plat/cpu.h