]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
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)
* 'master' of /home/wd/git/u-boot/custodians:
  powerpc/fsl_pci: Fix device tree fixups for newer platforms


Trivial merge