diff options
| author | Tom Rini <trini@ti.com> | 2013-12-10 22:15:18 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-12-10 22:15:18 (GMT) |
| commit | 4b210ad34282bfd9fc982a8e3c9a9126f4094cdb (patch) | |
| tree | f91ebdc46ede952728602d5ecc18e64ad0e52682 /include/gdsys_fpga.h | |
| parent | 65b7fe28a12bbaccc7a0c076f5f9f213150030e7 (diff) | |
| parent | f15ea6e1d67782a1626d4a4922b6c20e380085e5 (diff) | |
| download | u-boot-fsl-qoriq-4b210ad34282bfd9fc982a8e3c9a9126f4094cdb.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
board/samsung/trats2/trats2.c
include/configs/exynos5250-dt.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'include/gdsys_fpga.h')
0 files changed, 0 insertions, 0 deletions