Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Fri, 3 Jul 2015 12:36:29 +0000 (08:36 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 3 Jul 2015 12:41:02 +0000 (08:41 -0400)
commit808bf7cf655a1caa5f48f6f3a6b274f4b83ab8b4
tree8f45f687f0205be120412d87a63c36bda6ee8ae0
parent891b487098ee2169a16b1bbb354aaef28aa90630
parentaa5a0d98943e1b32109fd1fb325007c6cdcedc50
Merge branch 'master' of git://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>
arch/arm/Kconfig
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/colibri_vf.h
include/configs/mx6_common.h
include/configs/tqma6.h