Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Wed, 1 Jun 2011 20:01:10 +0000 (22:01 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 1 Jun 2011 20:01:10 +0000 (22:01 +0200)
commit54ca033b0f7f7cc627e191049fc6bdef79b8f3b9
tree62153203b185d98be6d43a8c0a300101ae440e44
parent8aebd75a4a7bfc6c7689e715bc1784c0add7d097
parent2130b03309dcf56dab11b6fd0be3b4bedc7f628c
Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  powerpc/fsl_pci: Fix device tree fixups for newer platforms