Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <trini@konsulko.com>
Fri, 24 Apr 2015 17:43:24 +0000 (13:43 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 24 Apr 2015 17:43:24 +0000 (13:43 -0400)
1  2 
arch/arm/Kconfig
common/spl/spl.c

Simple merge
Simple merge