From: Stefan Roese <sr@denx.de>
Date: Sat, 29 Dec 2007 08:23:11 +0000 (+0100)
Subject: Merge branch 'for-1.3.2-ver2'
X-Git-Tag: v1.3.2-rc1~100^2~58
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=feaa43f3a8f465cbf01ffa1b23b6b52431819a52;p=oweals%2Fu-boot.git

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>
---

feaa43f3a8f465cbf01ffa1b23b6b52431819a52