| commit | 519fdde9e6a6ebce7dc743b4f5621503d25b7a45 | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Tue Apr 08 09:25:08 2014 +0200 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Tue Apr 08 09:25:08 2014 +0200 |
| tree | 29649f48b92b92342183f71565c34afeca0b1735 | |
| parent | c71645ad2bd5179ad21e2501c26f574e9688f02a [diff] | |
| parent | 04d2f0a9f33112bd70ce4d9c451fdca1682e3a59 [diff] |
Merge branch 'u-boot/master' into 'u-boot-arm/master' Conflicts: arch/arm/cpu/arm926ejs/mxs/Makefile include/configs/trats.h include/configs/trats2.h include/mmc.h