| author | Tom Rini <trini@ti.com> | |
| Thu, 18 Apr 2013 20:16:01 +0000 (16:16 -0400) | ||
| committer | Tom Rini <trini@ti.com> | |
| Thu, 18 Apr 2013 20:16:01 +0000 (16:16 -0400) | ||
| commit | 17dcbfb0876385b13739b1b1f2026edc8163b629 | |
| tree | 5faa5949a895040398e70f6e8ef81dc9da88557e | tree | snapshot (tar.xz tar.gz zip) |
| parent | 669dfc2ed8d853d6bcdcafa1de6aca22929465e5 | commit | diff |
| parent | f2e8a87305a55652488af140adcf65b1e688f287 | commit | 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>
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 |