Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Fri, 15 Jul 2016 14:44:01 +0000 (10:44 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 15 Jul 2016 14:44:01 +0000 (10:44 -0400)
1  2 
common/spl/spl.c

Simple merge