Merge remote-tracking branch 'spi/fix/imx' into spi-linus
authorMark Brown <[email protected]>
Mon, 4 Apr 2016 17:05:47 +0000 (10:05 -0700)
committerMark Brown <[email protected]>
Mon, 4 Apr 2016 17:05:47 +0000 (10:05 -0700)

Trivial merge