tree 1874f61db490eda3bd29bc5e8e188df3e787a689
parent dfc956d8ee0b84eaba29434b7e5699bd81fed684
parent 1a7aaa58ec7aaa389cd6b200809908ec472d316b
author Mark Brown <broonie@kernel.org> 1448474267 +0000
committer Mark Brown <broonie@kernel.org> 1448474267 +0000

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