Merge remote-tracking branches 'spi/topic/dw', 'spi/topic/dw-mid', 'spi/topic/fsl...
authorMark Brown <broonie@kernel.org>
Mon, 11 Jan 2016 16:48:31 +0000 (16:48 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 11 Jan 2016 16:48:31 +0000 (16:48 +0000)

Trivial merge