Merge git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <trini@konsulko.com>
Sat, 28 Oct 2017 01:59:10 +0000 (21:59 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 28 Oct 2017 01:59:10 +0000 (21:59 -0400)
1  2 
include/configs/ls1012aqds.h
include/configs/ls1012ardb.h

Simple merge
Simple merge