commit | 7dda0c3759c6ee190d44b8ceaeab58047cb9a957 | [log] [tgz] |
---|---|---|
author | Wolfgang Denk <wd@denx.de> | Fri Feb 17 23:54:17 2012 +0100 |
committer | Wolfgang Denk <wd@denx.de> | Fri Feb 17 23:54:17 2012 +0100 |
tree | 0f57973c1ee7fa4344e07cf271fe16d2616b82f4 | |
parent | dbe20fc79736d4f99a9bfaafeae600c9348504df [diff] | |
parent | 79f49120ba481ed736face73ecf11a6c1070a861 [diff] |
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