projects
/
oweals
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a524e11
f492dd6
)
Merge branch 'master' of ssh+git://mercury.denx.de/home/wd/git/u-boot/master
author
Wolfgang Denk
<wd@denx.de>
Sat, 5 Jul 2008 23:15:17 +0000
(
01:15
+0200)
committer
Wolfgang Denk
<wd@denx.de>
Sat, 5 Jul 2008 23:15:17 +0000
(
01:15
+0200)
Conflicts:
board/amirix/ap1000/serial.c
board/exbitgen/exbitgen.c
board/exbitgen/flash.c
board/ml2/serial.c
board/xilinx/ml300/serial.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Trivial merge
projects / oweals / u-boot.git / commitdiff