summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-12-23 00:23:39 +0000
committerMark Brown <broonie@kernel.org>2015-12-23 00:23:39 +0000
commit64dc98d374967ca1a17e0dfa1ec040d7f9d09e12 (patch)
treeaab2b515ee4e9295a7af7c1ee09888cc2154f0ef /include/sound
parent38cfbc12c84890ad790c36f9a8ca9527a3b99409 (diff)
parent501f72e9c5205b9d70d5d61e9b186ae7ba873f73 (diff)
parent3de7c420a2b1737844d893cbfc689a9b2b5528cd (diff)
parent800cff79d7ab55c5ac4b7cef3e8d6d4a23a838d5 (diff)
Merge remote-tracking branches 'asoc/topic/da7219', 'asoc/topic/dai-link' and 'asoc/topic/doc' into asoc-next