Android SDK
  1. Android SDK

uboot-imx

Public

Commits

Tom Rini
c69ecd9722a + c2ded962d47
Tom Rini committed 84a6df09c78M
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>
Showing diff toc2ded962d47