]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'cleanup' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 2 May 2013 20:31:29 +0000 (21:31 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 2 May 2013 20:31:29 +0000 (21:31 +0100)
commit160e372bacdc07e441ccba847fa0ec5019ec4100
tree60ea1b403b41f651bc570f4c368ba82064880796
parent67ac0b4f0e531f998dd2cd57be1af759f22a14d8
parent49ad18ca2a74ecd1bab61be3e9a24b0109c08dd3
Merge branch 'cleanup' into for-linus

Conflicts:
arch/arm/plat-omap/dmtimer.c
16 files changed:
arch/arm/kernel/entry-armv.S
arch/arm/kernel/process.c
arch/arm/mach-exynos/mach-nuri.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