Skip to content
Commit 84a6df09 authored by Tom Rini's avatar Tom Rini
Browse files

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: default avatarTom Rini <trini@ti.com>
parents c69ecd97 c2ded962
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment