projects
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ed44387
c20a3c0
)
Merge branch 'master' of git://git.denx.de/u-boot-arm
author
Minkyu Kang
<mk7.kang@samsung.com>
Sat, 6 Feb 2010 08:20:09 +0000
(17:20 +0900)
committer
Minkyu Kang
<mk7.kang@samsung.com>
Sat, 6 Feb 2010 08:20:09 +0000
(17:20 +0900)
Conflicts:
cpu/arm_cortexa8/s5pc1xx/cache.c
include/configs/spear6xx.h
lib_ppc/reloc.S
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Trivial merge