Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Wed, 1 Jul 2015 19:38:12 +0000 (15:38 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 1 Jul 2015 19:38:12 +0000 (15:38 -0400)
commit891b487098ee2169a16b1bbb354aaef28aa90630
treedac06e8de18355c574eaf47fe29d75873ce0fda6
parent6762ae68887d962e1a4be193672005bdefd3ee32
parent8aa5f1d971df0f668144759991e19b5195606a32
Merge branch 'master' of git://git.denx.de/u-boot-spi