| commit | 757a92f4ecbbea7155651ae2df63941819e4104b | [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 | 53e512a0609f08c27f73cf05d210bae91acd9639 [diff] | |
| parent | 52bf1024dc67fb0a0c618c6cef972a3e574570b0 [diff] |
Merge branch 'u-boot/master' into 'u-boot-arm/master' Conflicts: common/cmd_fpga.c drivers/usb/host/ohci-at91.c