Merge remote-tracking branch 'asoc/fix/ssm4567' into asoc-linus

This commit is contained in:
Mark Brown 2015-07-24 16:18:19 +01:00
commit 5c851ba4d5