Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Thu, 1 Dec 2011 23:03:08 +0000 (00:03 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 1 Dec 2011 23:03:08 +0000 (00:03 +0100)
commit797449a16d7f56ce1a7e38e3d85061f933b92c17
treefcc0015191642a15c5dbea1ab2a34ebb80883b7a
parentd51e6d6de2b7dcba43fadcae2c89f7346d8bc301
parent255ef4d9091fe896ff152629a8cb290ee92c9fde
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

* 'master' of git://git.denx.de/u-boot-ppc4xx:
  ppc4xx: Add Io64 board support
  ppc4xx: fix PMC440 painit command
  ppc4xx: remove invalid access to PCI_BRDGOPT2 register
  ppc4xx: use CONFIG_PCI_BOOTDELAY instead of private implementation
MAINTAINERS
boards.cfg