diff options
| author | Tom Rini <trini@ti.com> | 2013-04-18 16:16:01 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-04-18 16:16:01 -0400 |
| commit | 17dcbfb0876385b13739b1b1f2026edc8163b629 (patch) | |
| tree | 5faa5949a895040398e70f6e8ef81dc9da88557e /include/cpsw.h | |
| parent | 669dfc2ed8d853d6bcdcafa1de6aca22929465e5 (diff) | |
| parent | f2e8a87305a55652488af140adcf65b1e688f287 (diff) | |
| download | u-boot-imx-17dcbfb0876385b13739b1b1f2026edc8163b629.zip u-boot-imx-17dcbfb0876385b13739b1b1f2026edc8163b629.tar.gz u-boot-imx-17dcbfb0876385b13739b1b1f2026edc8163b629.tar.bz2 | |
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>
Diffstat (limited to 'include/cpsw.h')
0 files changed, 0 insertions, 0 deletions