| commit | 79f38777947ac7685e2cef8bd977f954ab198c0e | [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 | 96764df1b47ddebfb50fadf5af72530b07b5fc89 [diff] | |
| parent | 9bd5c1ad0db802c9f8d49d72b443f03431cf6a89 [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