Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Wed, 28 Oct 2015 20:56:43 +0000 (16:56 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 28 Oct 2015 20:56:43 +0000 (16:56 -0400)
commit446d37c1acc76680770400fd90e6c502e49d72df
treef309e83e262b0ee6e41d0f1bf92af9fb0e3faa18
parentab0a6a5dba740afb490e6e7d417e345284e0dbec
parentbef87adf95e7ca923f866e27bbcccb2dad85df9f
Merge branch 'master' of git://git.denx.de/u-boot-spi
drivers/mtd/spi/sf_probe.c
drivers/spi/fsl_qspi.c
drivers/spi/ich.c