]> git.kernelconcepts.de Git - karo-tx-uboot.git/commit
projects / karo-tx-uboot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 669dfc2 f2e8a87)
Merge branch 'master' of git://git.denx.de/u-boot-arm into HEAD
authorTom Rini <trini@ti.com>
Thu, 18 Apr 2013 20:16:01 +0000 (16:16 -0400)
committerTom Rini <trini@ti.com>
Thu, 18 Apr 2013 20:16:01 +0000 (16:16 -0400)
commit17dcbfb0876385b13739b1b1f2026edc8163b629
tree5faa5949a895040398e70f6e8ef81dc9da88557etree | snapshot
parent669dfc2ed8d853d6bcdcafa1de6aca22929465e5commit | diff
parentf2e8a87305a55652488af140adcf65b1e688f287commit | diff
Merge branch 'master' of git://git.denx.de/u-boot-arm into HEAD

Quick manual fixup to merge the USB boot related defines and TPM related
defines.

Conflicts:
include/configs/exynos5250-dt.h

Signed-off-by: Tom Rini <trini@ti.com>
include/configs/exynos5250-dt.h diff1 | diff2 | blob | history
UBoot for KaRo TX COM modules