git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 67ac0b4 49ad18c)

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	160e372bacdc07e441ccba847fa0ec5019ec4100
tree	60ea1b403b41f651bc570f4c368ba82064880796	tree \| snapshot
parent	67ac0b4f0e531f998dd2cd57be1af759f22a14d8	commit \| diff
parent	49ad18ca2a74ecd1bab61be3e9a24b0109c08dd3	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

Linux Kernel Source Tree.