Merge remote-tracking branch 'spi/topic/xilinx' into spi-next
authorMark Brown <broonie@kernel.org>
Fri, 3 Oct 2014 15:33:44 +0000 (16:33 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 3 Oct 2014 15:33:44 +0000 (16:33 +0100)

Trivial merge