Merge branch 'master' of git://git.denx.de/u-boot-rockchip
authorTom Rini <trini@konsulko.com>
Tue, 11 Jul 2017 18:21:50 +0000 (14:21 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 11 Jul 2017 18:21:50 +0000 (14:21 -0400)
1  2 
arch/arm/dts/Makefile

Simple merge