Merge remote-tracking branch 'spi/fix/locking' into spi-next
authorMark Brown <[email protected]>
Mon, 25 Jul 2016 10:48:51 +0000 (11:48 +0100)
committerMark Brown <[email protected]>
Mon, 25 Jul 2016 10:48:51 +0000 (11:48 +0100)

Trivial merge