Merge remote-tracking branches 'spi/fix/dspi' and 'spi/fix/spidev' into spi-linus
authorMark Brown <broonie@kernel.org>
Wed, 16 Dec 2015 13:28:32 +0000 (13:28 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 16 Dec 2015 13:28:32 +0000 (13:28 +0000)

Trivial merge