Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Sun, 18 Dec 2016 18:54:25 +0000 (13:54 -0500)
committerTom Rini <trini@konsulko.com>
Sun, 18 Dec 2016 22:43:20 +0000 (17:43 -0500)
commit8ea05705a70135a94419b0d243666c1b51fe1f8d
tree495da728ccebe411445c144fb88ba35041db2096
parent0b4bc1b3ab1850fccbade3e6103f2036f6bdb364
parent854bb75be98ad792ff64c26ae38a1392ea185cd6
Merge branch 'master' of git://denx.de/git/u-boot-imx

Migrate CONFIG_ARCH_USE_MEMSET/MEMCPY with this merge.

Signed-off-by: Tom Rini <trini@konsulko.com>
arch/arm/Kconfig
include/configs/apalis_imx6.h
include/configs/colibri_imx6.h
include/configs/colibri_vf.h