From: roy zang <tie-fei.zang@freescale.com>
Date: Mon, 22 Jan 2007 05:15:35 +0000 (+0800)
Subject: Merge branch 'master' into hpc2
X-Git-Tag: v1.3.0-rc1~109^2~3^2~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ee460917afb74767aedc3da095d4fec4a50ba6f8;p=oweals%2Fu-boot.git

Merge branch 'master' into hpc2

Conflicts:

	drivers/cfi_flash.c

The patch by Heiko Schocher <hs@pollux.denx.de> on Jan, 19, 2007
fixes cfi_driver bug for mpc7448hpc2 board. The default cfi_driver can support
mpc7448hpc2 board.
---

ee460917afb74767aedc3da095d4fec4a50ba6f8