tree 3ee393d421c72a882d27b1de5978a2a9befce062
parent 8697e6a19b10f514511b6a9c86de88bd108c4f8d
parent e174ac34adf5d5653df12bc3cf19c52063a71269
author Stefan Roese <sr@denx.de> 1198916591 +0100
committer Stefan Roese <sr@denx.de> 1198916591 +0100

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>