From fc293f5f2a2d94b889666c3dc3faa09f6b55e3e3 Mon Sep 17 00:00:00 2001
From: Olof Johansson <olof@lixom.net>
Date: Tue, 11 Aug 2015 14:43:05 +0200
Subject: [PATCH] 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>
---
Reading git-format-patch failed