Merge remote-tracking branch 'spi/fix/rockchip' into spi-linus
authorMark Brown <broonie@kernel.org>
Thu, 10 Mar 2016 03:42:24 +0000 (10:42 +0700)
committerMark Brown <broonie@kernel.org>
Thu, 10 Mar 2016 03:42:24 +0000 (10:42 +0700)

Trivial merge