]> git.sur5r.net Git - u-boot/commit
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)
commitfeaa43f3a8f465cbf01ffa1b23b6b52431819a52
tree3ee393d421c72a882d27b1de5978a2a9befce062
parent8697e6a19b10f514511b6a9c86de88bd108c4f8d
parente174ac34adf5d5653df12bc3cf19c52063a71269
Merge branch 'for-1.3.2-ver2'

Conflicts:

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

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