]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
projects / karo-tx-uboot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 84a6df0)
Merge git://git.denx.de/u-boot-dm
authorTom Rini <trini@ti.com>
Sun, 26 Oct 2014 18:03:08 +0000 (14:03 -0400)
committerTom Rini <trini@ti.com>
Sun, 26 Oct 2014 18:03:08 +0000 (14:03 -0400)
Fix a trivial conflict over adding <dm.h>

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

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

No differences found
UBoot for KaRo TX COM modules