diff options
| author | Olof Johansson <olof@lixom.net> | 2015-08-11 14:43:05 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-11 14:43:09 +0200 |
| commit | fc293f5f2a2d94b889666c3dc3faa09f6b55e3e3 (patch) | |
| tree | 1b9954e3afc1f025a707032195125dacfc3030be /arch/arm/mach-nomadik/cpu-8815.c | |
| 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>
Diffstat (limited to 'arch/arm/mach-nomadik/cpu-8815.c')
0 files changed, 0 insertions, 0 deletions