]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
projects / people / ms / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16116dd 7deb3b3)
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Wed, 3 Sep 2008 20:55:55 +0000 (22:55 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 3 Sep 2008 20:55:55 +0000 (22:55 +0200)
Conflicts:

board/esd/dasa_sim/dasa_sim.c

Signed-off-by: Wolfgang Denk <wd@denx.de>
1  2 
board/esd/dasa_sim/dasa_sim.c patch | diff1 | diff2 | blob | history

diff --cc board/esd/dasa_sim/dasa_sim.c
Simple merge
"Das U-Boot" Source Tree