Tom Rini 84a6df09c7 Merge git://git.denx.de/u-boot-dm ...

Fix a trivial conflict over adding <dm.h>

Conflicts:
	arch/arm/cpu/armv7/omap3/board.c

Signed-off-by: Tom Rini <trini@ti.com>

2014-10-26 14:03:08 -04:00

4.8 KiB

Raw Blame History

View Raw