From: Wolfgang Denk <wd@denx.de>
Date: Fri, 13 Jan 2012 19:11:22 +0000 (+0100)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
X-Git-Tag: v2012.04-rc1~316^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c30186c60af24bc397b733910ca6fc39e74515f2;p=oweals%2Fu-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

* 'master' of git://git.denx.de/u-boot-ppc4xx:
  board/mpl/pati: use the CFI driver for the PATI board
  board/mpl/mip405: use the CFI driver for the MIP405/MIP405T board
  board/mpl/pip405: use the CFI driver for the PIP405 board
  board/mpl/common: remove the old legacy flash
  ppc4xx: Setup HICB on Io64
---

c30186c60af24bc397b733910ca6fc39e74515f2