| commit | a19b0dd62d7b8efc658fa1aa685ff5665878f3ee | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Thu May 30 14:45:06 2013 +0200 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Thu May 30 14:45:06 2013 +0200 |
| tree | 1fadf0fb3da83203ba28f209ec99e1b33e03f4d5 | |
| parent | 60985bba58e7695dac1fddae8cdbb62d8cfd1254 [diff] | |
| parent | a71d45d706a5b51c348160163b6c159632273fed [diff] |
Merge branch 'u-boot/master' into 'u-boot-arm/master' Conflicts: common/cmd_fpga.c drivers/usb/host/ohci-at91.c