]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0b596a4 9e41b4f)
Merge commit '9e41b4f' into omap-for-v3.10/timer
authorTony Lindgren <tony@atomide.com>
Wed, 3 Apr 2013 17:32:47 +0000 (10:32 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 3 Apr 2013 17:32:47 +0000 (10:32 -0700)
commit1921243b6e5988e2b80ce8c11e70b12ad30dac47
treec20d5c79e63533abf71ab8f89598eb777e9bee2btree | snapshot
parent0b596a4da7252a335d5040f8633d1a3855cce4bdcommit | diff
parent9e41b4fe5a6532ce64dd9bbe8916381dd9898cb3commit | diff
Merge commit '9e41b4f' 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
Linux Kernel Source Tree.