summaryrefslogtreecommitdiff
path: root/include/uapi/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-09-29 12:44:41 -0700
committerMark Brown <broonie@kernel.org>2016-09-29 12:44:41 -0700
commit5b56b9bb6ce64d72288a02dc3e8da5fc3eb0344a (patch)
tree7bf2db0afdda071842c795416ecfebbde61abb37 /include/uapi/sound
parent096388b76a1ba32d1b1e20bcc0e6b4901544eed1 (diff)
parent904a987345258ff95892685bcc4462f18ac259cd (diff)
parent899a247cf6d5bbb9eb799261791441d7d5ea2099 (diff)
parentf2b2f6dcd48adf81007b66e39bb7ca21d9bde250 (diff)
parentb7c8c5d6927f9e6f3b4c0f8fcc99daa4568ad185 (diff)
parentc9e902f4b37a3c108eb5dc51f1340c09becd7232 (diff)
Merge remote-tracking branches 'asoc/topic/sgtl5000', 'asoc/topic/simple', 'asoc/topic/stac9766', 'asoc/topic/sti' and 'asoc/topic/sunxi' into asoc-next