arm: mxs: remove conflict markers from merge
authorLothar Waßmann <LW@KARO-electronics.de>
Fri, 21 Aug 2015 14:44:32 +0000 (16:44 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Fri, 21 Aug 2015 14:44:32 +0000 (16:44 +0200)
commitffb54e6372daca45cd91612b003798cee957b781
tree3d5f7ad53819d1b9d2faf3276c2a3f5caaef775e
parent5adfb00f7abda1dade1e43238bfcab978f6075ad
arm: mxs: remove conflict markers from merge
board/karo/tx28/tx28.c