tree 3b2bf1b3689e9aad0d20f5a69ada168cae3cc769
parent c69ecd9722af22d50295eff81d0b9cd5b8adc2e0
parent c2ded962d4703a3f9522553004db4a6fe540f7e6
author Tom Rini <trini@ti.com> 1414346588 -0400
committer Tom Rini <trini@ti.com> 1414346588 -0400

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>