| commit | 3ff6fc327fd6b945aefe7a3eb3de9f46aa04611f | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Thu Jun 13 15:16:15 2013 -0400 |
| committer | Tom Rini <trini@ti.com> | Thu Jun 13 15:16:15 2013 -0400 |
| tree | 850a87b274b572b65a579474a0aad5e590ca6d61 | |
| parent | 06a1b3fac7170eb8df782a80e0bed621f872416b [diff] | |
| parent | d81863dbf095a240494426aac8d47245ba251338 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-arm Small conflict over DRA7XX updates and adding SRAM_SCRATCH_SPACE_ADDR Conflicts: arch/arm/include/asm/arch-omap5/omap.h Signed-off-by: Tom Rini <trini@ti.com>