Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Fri, 11 Dec 2015 20:07:44 +0000 (15:07 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 11 Dec 2015 20:07:44 +0000 (15:07 -0500)
commit5076c64a08d2083af5a7761b12a30116ef0da967
tree08953f1cd25ed155eb819162eb495f0153c3edd5
parentf7a5f025ba0bc405e321df4dd55b73a7995ba527
parent76de51a6da0411e1f3e80e1c9a2ef5bfa8e35571
Merge branch 'master' of git://git.denx.de/u-boot-spi