| commit | f15ea6e1d67782a1626d4a4922b6c20e380085e5 | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Tue Dec 10 14:31:56 2013 +0100 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Tue Dec 10 22:23:59 2013 +0100 |
| tree | 57d78f1ee94a2060eaa591533278d2934d4f1da3 | |
| parent | cb7ee1b98cac6baf244daefb1192adf5a47bc983 [diff] | |
| parent | f44483b57c49282299da0e5c10073b909cdad979 [diff] |
Merge branch 'u-boot/master' into 'u-boot-arm/master' Conflicts: arch/arm/cpu/armv7/rmobile/Makefile doc/README.scrapyard Needed manual fix: arch/arm/cpu/armv7/omap-common/Makefile board/compulab/cm_t335/u-boot.lds