| commit | b56eeed8023a07223ab751ae577b49cf8f40261d | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Tue Jan 08 13:15:45 2013 +0100 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Tue Jan 08 13:15:45 2013 +0100 |
| tree | 6fe053ef751b1c424ec50be338844197b6421d74 | |
| parent | 8f9e08b849aad4381c03b023a689ca2ad2fb5157 [diff] | |
| parent | 053338257811697c56b003b0a379138b5388ba35 [diff] |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' This required manual merging drivers/mtd/nand/Makefile and adding am335x_evm support for CONFIG_SPL_NAND_DRIVERS