Tom Rini 4b210ad342 Merge branch 'master' of git://git.denx.de/u-boot-arm ... Conflicts: board/samsung/trats2/trats2.c include/configs/exynos5250-dt.h Signed-off-by: Tom Rini <trini@ti.com>		2013-12-10 17:15:18 -05:00
..
Makefile	board: arm: convert makefiles to Kbuild style	2013-11-01 11:42:12 -04:00
trats2.c	Merge branch 'master' of git://git.denx.de/u-boot-arm	2013-12-10 17:15:18 -05:00