summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-02-08 18:36:02 +0000
committerMark Brown <broonie@kernel.org>2017-02-08 18:36:02 +0000
commitf5a2cd60274822529c67462a1839eb456554a253 (patch)
tree1ceb3d243f2c91c481fafa3478ce489580304e00 /sound
parent6eec156663683ca762117b3abe24397990ae7097 (diff)
parent80691c8f08b3b516df8833817dfdf15cfa1b9067 (diff)
parentb6e643adfd68258e16babaf36353c9668384350f (diff)
parenteaae2ea735933bcf57227956ab9bcd8464d1519a (diff)
parente98aa526b4c5eb322b1334b1d7f7051851ed037c (diff)
Merge remote-tracking branches 'asoc/topic/pxa', 'asoc/topic/qcom', 'asoc/topic/rockchip' and 'asoc/topic/rt5514' into asoc-next