Merge remote-tracking branch 'asoc/fix/ssm4567' into asoc-linus
authorMark Brown <broonie@kernel.org>
Fri, 24 Jul 2015 15:18:19 +0000 (16:18 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 24 Jul 2015 15:18:19 +0000 (16:18 +0100)

Trivial merge