Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Thu, 19 Nov 2015 18:27:26 +0000 (13:27 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 19 Nov 2015 18:27:26 +0000 (13:27 -0500)
commit9ef671c9d4c70af3f8b21d8a31a89af4dc74d6b3
treeda4d08ed85efe51d8799eee94b2ccf4a79c4b278
parentaa7077fcee6cf00cde59bb9709ebd6205720f8bf
parent3e56ecec435d30e25fcffb971f8c9627e85ac1df
Merge branch 'master' of git://git.denx.de/u-boot-spi