Skip to content
Commit fc293f5f authored by Olof Johansson's avatar Olof Johansson
Browse files

ARM: shmobile: Fix mismerges 



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

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent c00def71
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment