ARM: shmobile: Fix mismerges
Turns out I fumbled a couple of the merge resolutions for marzen board removal.
Signed-off-by: NOlof Johansson <olof@lixom.net>
Showing
想要评论请 注册 或 登录
Turns out I fumbled a couple of the merge resolutions for marzen board removal.
Signed-off-by: NOlof Johansson <olof@lixom.net>