| commit | 87bde001401e9d68a03a8842a694e564d9d1efd7 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Thu Apr 18 16:16:01 2013 -0400 |
| committer | Tom Rini <trini@ti.com> | Thu Apr 18 16:16:01 2013 -0400 |
| tree | 5faa5949a895040398e70f6e8ef81dc9da88557e | |
| parent | bd8ca278a85a53603cb70370c1ecd6f09b94d4c2 [diff] | |
| parent | 36558ca5803d526433950fbf236db384463529d9 [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>