Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Tue, 26 Jul 2016 22:33:04 +0000 (18:33 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 26 Jul 2016 22:33:04 +0000 (18:33 -0400)
1  2 
arch/arm/dts/Makefile

Simple merge