summaryrefslogtreecommitdiff
path: root/include/uapi/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-12-23 00:23:52 +0000
committerMark Brown <broonie@kernel.org>2015-12-23 00:23:52 +0000
commit2d850b1e6cbeacd8be96313d74e9a7b10bdd3f0e (patch)
treedb5f69d5c1c903d91aae758c0fb760c30009d10d /include/uapi/sound
parent14418aa7d4395651645c5f36bfe42324e27e0360 (diff)
parent319c32597fc22a58b946a6146f2be1fd208582e0 (diff)
parent4b6c56c2f5d2b24629780a76718c3a836e7bf044 (diff)
parentb70381c35f65bbe1a2339e2833a574f0473162fa (diff)
parent28b5df1838b357c9e3e8eba02f684df3c0db05b3 (diff)
Merge remote-tracking branches 'asoc/topic/tegra', 'asoc/topic/topology', 'asoc/topic/wm8903' and 'asoc/topic/wm8904' into asoc-next