Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@konsulko.com>
Fri, 3 Jun 2016 01:42:23 +0000 (21:42 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 3 Jun 2016 01:42:23 +0000 (21:42 -0400)
1  2 
common/spl/spl.c

Simple merge