diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-04-05 10:24:20 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-05 10:24:20 (GMT) |
| commit | 4db2fa7f9446d0f2fe8db3d62184b1212fe22707 (patch) | |
| tree | bc62cbfc14296551caebda626db7a90fef9ae844 /disk/Makefile | |
| parent | 75df0d594990875419121c6f8687472ac9f4ae7a (diff) | |
| parent | 7d3053fbf16caad4745f42f7ae3e38e9d3e964b5 (diff) | |
| download | u-boot-4db2fa7f9446d0f2fe8db3d62184b1212fe22707.tar.xz | |
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>
Diffstat (limited to 'disk/Makefile')
0 files changed, 0 insertions, 0 deletions