]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8697e6a e174ac3)
Merge branch 'for-1.3.2-ver2'
authorStefan Roese <sr@denx.de>
Sat, 29 Dec 2007 08:23:11 +0000 (09:23 +0100)
committerStefan Roese <sr@denx.de>
Sat, 29 Dec 2007 08:23:11 +0000 (09:23 +0100)
Conflicts:

cpu/ppc4xx/fdt.c
include/configs/kilauea.h
include/configs/sequoia.h

Signed-off-by: Stefan Roese <sr@denx.de>

Trivial merge
Cloned from git://git.denx.de/u-boot.git