| commit | 35610c6b15ee19f0127d494324374c4d103a2b3e | [log] [tgz] |
|---|---|---|
| author | Markus Klotzbuecher <mk@denx.de> | Tue Oct 21 09:18:01 2008 +0200 |
| committer | Markus Klotzbuecher <mk@denx.de> | Tue Oct 21 09:18:01 2008 +0200 |
| tree | ea1a183343573c2a48248923b96d316c0956727c | |
| parent | d8c55ab05cef21b33a448fd147638bb9ba22e5b4 [diff] | |
| parent | 4216d75acc7e537cb883ce1b15012a09a4af3d16 [diff] |
Merge git://git.denx.de/u-boot into x1 Conflicts: drivers/usb/usb_ohci.c