summaryrefslogtreecommitdiff
path: root/sound/soc/qcom
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-12-12 18:53:07 +0300
committerMark Brown <broonie@kernel.org>2016-12-12 18:53:07 +0300
commit2f028b15a232737ba8dd5b883adcca3471a8280e (patch)
treea09a2586ed435754bd8c6739e424f673784bdac3 /sound/soc/qcom
parentb8f04c19432624950be5a303679257cafbaa5b1a (diff)
parent1ef5bcd57be5c8b31286b7b47828064be25f266b (diff)
parent92be58106e5d750b97567bea7171f5aee74a678a (diff)
parentb4f89a0cce0d579fda6c1f6db72202c6bf2ae95f (diff)
parentbf8e27621effb49da525fb92a1f192db685d39bd (diff)
downloadlinux-2f028b15a232737ba8dd5b883adcca3471a8280e.tar.xz
Merge remote-tracking branches 'asoc/topic/of-graph', 'asoc/topic/pxa', 'asoc/topic/qcom' and 'asoc/topic/rk808' into asoc-next