]> git.baikalelectronics.ru Git - uboot.git/commit
Merge git://git.denx.de/u-boot-imx
authorTom Rini <trini@konsulko.com>
Fri, 1 Sep 2017 14:40:59 +0000 (10:40 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 1 Sep 2017 14:40:59 +0000 (10:40 -0400)
commita926f20104fc037cb4e2d67da5f3427ab4ddf689
tree0b76045a178e9c0ed61e141bd8dfb3e34e4e86a9
parent91e16382c9d052fac6fb060109f854155829031b
parent6edcfebce8f2f1a3ab31f4964b474d252a781d7d
Merge git://git.denx.de/u-boot-imx

Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
configs/imx6qdl_icore_mmc_defconfig
configs/imx6qdl_icore_rqs_defconfig
configs/apalis_imx6_defconfig
configs/colibri_imx6_defconfig
configs/imx6qdl_icore_mmc_defconfig