| commit | 41341221d12341a2ecfb280142d6478071738fc2 | [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 | b7ab8b8ff092ab8214eeb86e8a79573154f448b9 [diff] | |
| parent | 847e6693ccb529bf8346db62876f38f0c4e04ade [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>