| commit | 601a7c76894d2641344032351fd81425b53e8ae2 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Fri Jul 03 08:36:29 2015 -0400 |
| committer | Tom Rini <trini@konsulko.com> | Fri Jul 03 08:41:02 2015 -0400 |
| tree | 8f45f687f0205be120412d87a63c36bda6ee8ae0 | |
| parent | a7e47246d663c179df777baca6a7e518ed574230 [diff] | |
| parent | 0d92de41078c712a7b73e47791520a6420bc926d [diff] |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx Conflicts: configs/tbs2910_defconfig configs/tqma6q_mba6_mmc_defconfig configs/tqma6q_mba6_spi_defconfig configs/tqma6s_mba6_mmc_defconfig configs/tqma6s_mba6_spi_defconfig include/configs/mx6_common.h Signed-off-by: Tom Rini <trini@konsulko.com>