]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c00def7) | patch
ARM: shmobile: Fix mismerges
authorOlof Johansson <olof@lixom.net>
Tue, 11 Aug 2015 12:43:05 +0000 (14:43 +0200)
committerOlof Johansson <olof@lixom.net>
Tue, 11 Aug 2015 12:43:09 +0000 (14:43 +0200)
commitfc293f5f2a2d94b889666c3dc3faa09f6b55e3e3
tree1b9954e3afc1f025a707032195125dacfc3030betree | snapshot
parentc00def71efd919e8ae835a25f4f4c80a4b2d36d3commit | diff
ARM: shmobile: Fix mismerges

Turns out I fumbled a couple of the merge resolutions for marzen board removal.

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/boot/dts/Makefile diff | blob | history
arch/arm/mach-shmobile/Makefile diff | blob | history
Linux kernel for KaRo TX COM modules