Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@ti.com>
Wed, 11 Jun 2014 15:40:11 +0000 (11:40 -0400)
committerTom Rini <trini@ti.com>
Wed, 11 Jun 2014 15:40:11 +0000 (11:40 -0400)
commit28b62f0de361ae640eb286969536a236cc8febda
tree6c36f500b3d8ed64e0b79a0f043c819a2aad66b5
parent61e76f53708cf082ef9061a140b57df3513b8ba1
parent1f436a6ddf7eb7f2da1c8df6c13100429baf844a
Merge branch 'master' of git://git.denx.de/u-boot-spi