Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Mon, 19 Jun 2017 12:08:40 +0000 (08:08 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 19 Jun 2017 12:08:40 +0000 (08:08 -0400)
1  2 
arch/arm/dts/Makefile

Simple merge