| commit | 4b210ad34282bfd9fc982a8e3c9a9126f4094cdb | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Tue Dec 10 17:15:18 2013 -0500 |
| committer | Tom Rini <trini@ti.com> | Tue Dec 10 17:15:18 2013 -0500 |
| tree | f91ebdc46ede952728602d5ecc18e64ad0e52682 | |
| parent | 65b7fe28a12bbaccc7a0c076f5f9f213150030e7 [diff] | |
| parent | f15ea6e1d67782a1626d4a4922b6c20e380085e5 [diff] |
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>