Merge branch 'master' of git://git.denx.de/u-boot-mmc
authorTom Rini <trini@konsulko.com>
Fri, 18 Aug 2017 22:24:36 +0000 (18:24 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 18 Aug 2017 22:24:36 +0000 (18:24 -0400)
commit1fdafb2e3dfecdc4129a8062ad25b1adb32b0efb
tree6c6a74d4cb4e8a19bfd47510ade9fdcc3d08cb01
parenta6dd10c70be9be863488d9d7afede057a4d99823
parenta191ccaf12fb4fadedcd3c76df6327e2bb0f182b
Merge branch 'master' of git://git.denx.de/u-boot-mmc
arch/arm/Kconfig
arch/arm/dts/Makefile
board/compulab/cm_fx6/cm_fx6.c
common/splash_source.c