From: Olof Johansson <olof@lixom.net>
Date: Tue, 11 Aug 2015 12:43:05 +0000 (+0200)
Subject: ARM: shmobile: Fix mismerges
X-Git-Tag: omap-for-v4.3/fixes-merge-window~9^2~11
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc293f5f2a2d94b889666c3dc3faa09f6b55e3e3;p=pandora-kernel.git

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-diff-tree failed