| commit | e936628dc70e98baa3bc1827b74aa70d1fa48404 | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Tue Apr 05 12:24:20 2011 +0200 |
| committer | Wolfgang Denk <wd@denx.de> | Tue Apr 05 12:24:20 2011 +0200 |
| tree | bc62cbfc14296551caebda626db7a90fef9ae844 | |
| parent | 5f7aac27b708f8618f6e698082982d9256543034 [diff] | |
| parent | 020edd24c1b872a7faa41b0318863caa19e1dd7d [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx Conflicts: drivers/usb/host/ehci-pci.c Signed-off-by: Wolfgang Denk <wd@denx.de>