projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
4134122
)
Merge branch 'master' of git://git.denx.de/u-boot-arm
author
Tom Rini
<trini@ti.com>
Thu, 13 Jun 2013 19:16:15 +0000
(15:16 -0400)
committer
Tom Rini
<trini@ti.com>
Thu, 13 Jun 2013 19:16:15 +0000
(15:16 -0400)
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>
No differences found