Merge remote-tracking branches 'spi/topic/coldfire' and 'spi/topic/dw' into spi-next
authorMark Brown <broonie@kernel.org>
Wed, 4 Nov 2015 11:02:09 +0000 (11:02 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 4 Nov 2015 11:02:09 +0000 (11:02 +0000)

Trivial merge