git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1056124 7185684)

author	Tony Lindgren <tony@atomide.com>
	Wed, 3 Apr 2013 17:32:47 +0000 (10:32 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Wed, 3 Apr 2013 17:32:47 +0000 (10:32 -0700)
commit	43231b5be657fde1c4ced180d829bbd59ceef9ad
tree	c20d5c79e63533abf71ab8f89598eb777e9bee2b	tree \| snapshot
parent	105612489bf59386b46b3f9f034e03f70e57aee6	commit \| diff
parent	71856843fb1d8ee455a4c1a60696c74afa4809e5	commit \| diff

Merge commit '7185684' 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	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

John Crispins staging tree