]> git.sur5r.net Git - u-boot/commit
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Sun, 19 Mar 2017 18:49:26 +0000 (14:49 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 19 Mar 2017 19:13:38 +0000 (15:13 -0400)
commit02ccab1908c405fe1449457d4a0d343784a30acb
tree3a5d41abff96a3af22587ace67713d5c0165b097
parentf40574e2d78c96a3818c4fa2379382d924866a6e
parentd883fcc6bbb2fcc3df90857fee99c2f543a0289c
Merge branch 'master' of git://www.denx.de/git/u-boot-imx

Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
configs/bk4r1_defconfig
configs/colibri_vf_defconfig
configs/pcm052_defconfig
include/configs/colibri_vf.h
include/configs/pcm052.h
14 files changed:
arch/arm/Kconfig
arch/arm/dts/Makefile
arch/arm/dts/imx6ul-isiot.dtsi
configs/bk4r1_defconfig
configs/colibri_imx6_nospl_defconfig
configs/colibri_imx7_defconfig
configs/colibri_vf_defconfig
configs/pcm052_defconfig
include/configs/apalis_imx6.h
include/configs/colibri_imx6.h
include/configs/colibri_imx7.h
include/configs/colibri_vf.h
include/configs/pcm052.h
include/configs/vf610twr.h