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)
commit68a595c7754d22bfe741a27c7df0965160df575d
tree910d79a3270b48a995a7e19050da95b9999ea4c5
parentf22e6e847115abc3a0e2ad7bb18d243d42275af1
parent8543d0e72d4340001d756bd89bee70ce239e1ea5
Merge remote-tracking branch 'spi/fix/img-spfi' into spi-linus
drivers/spi/spi-img-spfi.c