From: Wolfgang Denk <wd@denx.de>
Date: Thu, 1 Dec 2011 23:03:08 +0000 (+0100)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
X-Git-Tag: v2011.12-rc1~106^2~15
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=797449a16d7f56ce1a7e38e3d85061f933b92c17;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:
  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
---

797449a16d7f56ce1a7e38e3d85061f933b92c17