Merge remote-tracking branch 'spi/fix/img-spfi' into spi-linus
authorMark Brown <broonie@kernel.org>
Sat, 11 Apr 2015 22:08:54 +0000 (23:08 +0100)
committerMark Brown <broonie@kernel.org>
Sat, 11 Apr 2015 22:08:54 +0000 (23:08 +0100)

Trivial merge