| commit | fc293f5f2a2d94b889666c3dc3faa09f6b55e3e3 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Tue Aug 11 14:43:05 2015 +0200 |
| committer | Olof Johansson <olof@lixom.net> | Tue Aug 11 14:43:09 2015 +0200 |
| tree | 1b9954e3afc1f025a707032195125dacfc3030be | |
| parent | c00def71efd919e8ae835a25f4f4c80a4b2d36d3 [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>