| commit | 808bf7cf655a1caa5f48f6f3a6b274f4b83ab8b4 | [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 | 891b487098ee2169a16b1bbb354aaef28aa90630 [diff] | |
| parent | aa5a0d98943e1b32109fd1fb325007c6cdcedc50 [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>