tree 547e64eab6bc6991a73576c55f223e435048726f
parent 030bbdbf4c833bc69f502eae58498bc5572db736
parent fdb6eb0a12871d5bfaf266c5a0d5259a5437a72f
author Mark Brown <broonie@kernel.org> 1431459092 +0100
committer Mark Brown <broonie@kernel.org> 1431459092 +0100

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