]> git.sur5r.net Git - u-boot/commitdiff
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)
* '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

1  2 
MAINTAINERS
boards.cfg

diff --cc MAINTAINERS
Simple merge
diff --cc boards.cfg
Simple merge