git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 946342d 008ca43)

author	Russell King <rmk+kernel@arm.linux.org.uk>
	Thu, 2 May 2013 20:31:29 +0000 (21:31 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Thu, 2 May 2013 20:31:29 +0000 (21:31 +0100)
commit	33b9f582c5c1db515412cc7efff28f7d1779321f
tree	60ea1b403b41f651bc570f4c368ba82064880796	tree \| snapshot
parent	946342d03ec4e8367bba7bb99e7155e97f69058a	commit \| diff
parent	008ca431822f39a023322b3598d8366faf46cfc1	commit \| diff

Merge branch 'cleanup' into for-linus

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

16 files changed:

arch/arm/kernel/entry-armv.S	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-nuri.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-integrator/integrator_ap.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-integrator/integrator_cp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3beagle.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/gpmc-onenand.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/gpmc.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_device.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/pm-debug.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/powerdomain.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/timer.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-tegra/tegra2_emc.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/cpu.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/dmtimer.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git