Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <trini@konsulko.com>
Tue, 24 May 2016 17:42:03 +0000 (13:42 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 24 May 2016 17:42:03 +0000 (13:42 -0400)
1  2 
arch/arm/include/asm/arch-ls102xa/config.h
include/configs/ls2080aqds.h
include/configs/ls2080ardb.h

Simple merge
Simple merge