Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Sat, 8 Oct 2016 02:02:10 +0000 (22:02 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 8 Oct 2016 13:33:37 +0000 (09:33 -0400)
1  2 
Makefile
arch/arm/dts/Makefile

diff --cc Makefile
Simple merge
Simple merge