Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Fri, 13 Jan 2012 19:11:25 +0000 (20:11 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 13 Jan 2012 19:11:25 +0000 (20:11 +0100)
commitf563db33c1085bf7d616b98cac62337beb65b0a2
treefedb727b35c0ce1b2404907c6b8c34ffb1dd811c
parentc0219cf08f53d914b4557ef658472b8799c3f9a7
parentc30186c60af24bc397b733910ca6fc39e74515f2
Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  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