| commit | 009d75ccc11d27b9a083375a88bb93cb746b4800 | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Thu Mar 28 18:50:01 2013 +0100 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Thu Mar 28 18:50:01 2013 +0100 |
| tree | 12abe9fcf437d58b73ee1fa8d422548560deaae5 | |
| parent | 417c55803118eb8e350d5ab8ba6583fb39f4e2e3 [diff] | |
| parent | d53e340edf65ff253d3a7b06ebe60501045892e3 [diff] |
Merge branch 'u-boot/master' into 'u-boot-arm/master' Conflicts: drivers/spi/tegra20_sflash.c include/fdtdec.h lib/fdtdec.c