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)
commit3f6dcdb9cd4dbda226a1474f1e9398413e906b41
treefb3a7d7873e9c14a3733197e4cc028ce90827970
parentd8c1d5d5fb6eafbc532982125f006e49f2c40e71
parentab10d73d2fc13bd5baf5024e54ad92641d238bdb
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
arch/arm/Kconfig
common/spl/spl.c