Merge remote-tracking branches 'spi/topic/spidev' and 'spi/topic/txx9' into spi-next
authorMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 12:17:20 +0000 (12:17 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 12:17:20 +0000 (12:17 +0000)

Trivial merge