]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Fri, 17 Feb 2012 22:54:17 +0000 (23:54 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 17 Feb 2012 22:54:17 +0000 (23:54 +0100)
* 'master' of git://git.denx.de/u-boot-mpc85xx:
  powerpc/8xxx:Add MPH controller support in USB device-tree fixup
  powerpc/8xxx: Cleanup USB device-tree fixup


Trivial merge