]> git.baikalelectronics.ru Git - kernel.git/commit
Merge commit 'c7c20c5' into omap-for-v3.10/timer
authorTony Lindgren <tony@atomide.com>
Wed, 3 Apr 2013 17:32:47 +0000 (10:32 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 3 Apr 2013 17:32:47 +0000 (10:32 -0700)
commit3a0b1d4a63ba8caafc2c8ec69457bb9b68c6fc42
treec20d5c79e63533abf71ab8f89598eb777e9bee2b
parent1b911247f3c8d8005cd0a9a01507d16c21de873b
parentc7c20c5dc7ee258a3fbfa7b7bce3e15033419868
Merge commit 'c7c20c5' into omap-for-v3.10/timer

Conflicts:
arch/arm/plat-omap/dmtimer.c

Resolve merge conflict in omap_device.c as per
Lothar Waßmann <LW@KARO-electronics.de>.
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