Merge remote-tracking branch 'spi/fix/msiof' into spi-sh-msiof
authorMark Brown <broonie@kernel.org>
Tue, 6 Jan 2015 11:06:46 +0000 (11:06 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 6 Jan 2015 11:06:46 +0000 (11:06 +0000)
commit6b038c8d2b99b552f0b025c8a134f8a3c417a3e7
tree8a2d2b9a0de682a2e9ffe7a265b056fc57492e96
parent3110628d89f80fbafa085fd62e75afcb39fb764c
parent6d40530e4789b3e2f14d61ca57ab02bd5395d5c9
Merge remote-tracking branch 'spi/fix/msiof' into spi-sh-msiof

Conflicts:
drivers/spi/spi-sh-msiof.c
drivers/spi/spi-sh-msiof.c