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: c7c20c5 cb33ef2)

author	Jon Hunter <jon-hunter@ti.com>
	Mon, 1 Apr 2013 19:33:50 +0000 (14:33 -0500)
committer	Jon Hunter <jon-hunter@ti.com>
	Mon, 1 Apr 2013 19:33:50 +0000 (14:33 -0500)
commit	e9deca2693c2473cd5f24d5d792137c296532716
tree	a3689b801070c1360b120b7280c6adc4de5f692a	tree \| snapshot
parent	c7c20c5dc7ee258a3fbfa7b7bce3e15033419868	commit \| diff
parent	cb33ef2470b56551dc2c7b00fb04b6a7fe3cdc96	commit \| diff

Merge commit 'cb33ef2470b56551dc2c7b00fb04b6a7fe3cdc96' into tmp

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

14 files changed:

arch/arm/kernel/process.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.