Merge remote-tracking branch 'spi/topic/core' into spi-next
authorMark Brown <[email protected]>
Sun, 19 Feb 2017 16:40:55 +0000 (16:40 +0000)
committerMark Brown <[email protected]>
Sun, 19 Feb 2017 16:40:55 +0000 (16:40 +0000)

Trivial merge