Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Mon, 8 Jun 2015 12:37:02 +0000 (08:37 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 8 Jun 2015 12:37:02 +0000 (08:37 -0400)
commit4d80051b63ff54f6b6f90fceb92cf87ab3401ecb
treeaea5bee67c756558fc8c820b4ee04adb75c85146
parent5bcec545a6ca977ad74ee9fe0f2b335d348b5000
parent943a3f2ccb71bcb4a6041bc2946129c4d4bb197e
Merge branch 'master' of git://denx.de/git/u-boot-imx
arch/arm/dts/Makefile
configs/colibri_vf_defconfig
include/configs/colibri_vf.h
include/configs/tqma6.h
include/configs/wandboard.h
include/configs/warp.h