Conflicts: board/samsung/trats2/trats2.c include/configs/exynos5250-dt.h Signed-off-by: Tom Rini <trini@ti.com> |
||
---|---|---|
.. | ||
Makefile | ||
setup.h | ||
trats.c |
Conflicts: board/samsung/trats2/trats2.c include/configs/exynos5250-dt.h Signed-off-by: Tom Rini <trini@ti.com> |
||
---|---|---|
.. | ||
Makefile | ||
setup.h | ||
trats.c |