Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@ti.com>
Thu, 8 Jan 2015 18:50:38 +0000 (13:50 -0500)
committerTom Rini <trini@ti.com>
Thu, 8 Jan 2015 18:50:38 +0000 (13:50 -0500)
commitf10d86d3fff9f53723a404b3794cca98a785ce6a
treeac3ba29d5b79ef0d00734c677320211771631782
parent906d6fe3033910a5eca72ef6fc9b47a957b113e5
parentadc0fabfd9662fa690e866332cd4277351f991c4
Merge branch 'master' of git://git.denx.de/u-boot-spi