summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-30 15:57:34 +0100
committerMark Brown <broonie@kernel.org>2015-08-30 15:57:34 +0100
commit428157c1e8c9eaf0029430ae82ec0df8578de46b (patch)
tree0de40457ec327569611ae114613e529c11f3060c /include/sound
parent0a5ff077572d058d3023d243ba97a7e98d111f4c (diff)
parent82cf77a1bd61d981184a355742a9b5c78f286f97 (diff)
parent9425e9d8c77dd9f40c5f199127a63be2e2b7c1f4 (diff)
parentf57ddcdfa146636dbdcd6ac0a6d22c15d47b08c8 (diff)
parent2e45a25f9cb6546d8b3c20d9461e21f8c0a75a8a (diff)
parent1a3232d2f61d2853a848464b7bde2d54960c58bb (diff)
Merge remote-tracking branches 'asoc/topic/tas2552', 'asoc/topic/tas5086', 'asoc/topic/tegra', 'asoc/topic/tlv' and 'asoc/topic/topology' into asoc-next