Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Wed, 1 Jun 2011 20:01:07 +0000 (22:01 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 1 Jun 2011 20:01:07 +0000 (22:01 +0200)
commit2130b03309dcf56dab11b6fd0be3b4bedc7f628c
tree67bce234fa47a31b220b41b399ca4aec0a2250c5
parenteb3abce898ce0d9c711ed1d107bd8b0ccf3c07de
parent8f29084a4f020ddc2d15a0f374f08f80aa8b39a0
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

* 'master' of git://git.denx.de/u-boot-mpc85xx:
  powerpc/fsl_pci: Fix device tree fixups for newer platforms