]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - keystone-linux/linux.git/commit
Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmp
authorJon Hunter <jon-hunter@ti.com>
Mon, 1 Apr 2013 19:33:50 +0000 (14:33 -0500)
committerJon Hunter <jon-hunter@ti.com>
Mon, 1 Apr 2013 19:33:50 +0000 (14:33 -0500)
commitdca3a783400a18e2bf4503b1d4a85c4d0ca1a7e4
treea3689b801070c1360b120b7280c6adc4de5f692a
parent71856843fb1d8ee455a4c1a60696c74afa4809e5
parent31d9adca82ce65e5c99d045b5fd917c702b6fce3
Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmp

Conflicts:
arch/arm/plat-omap/dmtimer.c
14 files changed:
arch/arm/kernel/process.c
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/gpmc-onenand.c
arch/arm/mach-omap2/gpmc.c
arch/arm/mach-omap2/omap_device.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/pm-debug.c
arch/arm/mach-omap2/powerdomain.c
arch/arm/mach-omap2/timer.c
arch/arm/mach-tegra/tegra2_emc.c
arch/arm/mach-ux500/cpu.c
arch/arm/plat-omap/dmtimer.c