Learn more about cloning repositories
You have read-only access
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>
