| commit | 46f5a763136f33e038510956e36bee802c7f4787 | [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 | fada6ddcdb09ea3d58e6ab721f8e9093cd8fc946 [diff] | |
| parent | 1d17de6703af21820659d86d528e74e78fde9765 [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>