]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4109d70 63af4b0)
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)
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
configs/imx6qdl_icore_mmc_defconfig
configs/imx6qdl_icore_rqs_defconfig

1  2 
configs/apalis_imx6_defconfig patch | diff1 | diff2 | blob | history
configs/colibri_imx6_defconfig patch | diff1 | diff2 | blob | history
configs/imx6qdl_icore_mmc_defconfig patch | diff1 | diff2 | blob | history

diff --cc configs/apalis_imx6_defconfig
Simple merge
diff --cc configs/colibri_imx6_defconfig
Simple merge
diff --cc configs/imx6qdl_icore_mmc_defconfig
Simple merge
Cloned from git://git.denx.de/u-boot.git