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)
commit7dda0c3759c6ee190d44b8ceaeab58047cb9a957
tree0f57973c1ee7fa4344e07cf271fe16d2616b82f4
parentdbe20fc79736d4f99a9bfaafeae600c9348504df
parent79f49120ba481ed736face73ecf11a6c1070a861
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

* '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