diff options
author | Mark Brown <broonie@kernel.org> | 2017-02-19 16:36:44 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-02-19 16:36:44 +0000 |
commit | 8237d99c3b1b8112d1eb7a7f763b5a9afde847ae (patch) | |
tree | 0c57aed2def9b2f7d85e1571fa1d8c1a036a120c /sound | |
parent | a701802c4e724a9592c3da9893449fbc82b0cfc6 (diff) | |
parent | 80691c8f08b3b516df8833817dfdf15cfa1b9067 (diff) | |
parent | b6e643adfd68258e16babaf36353c9668384350f (diff) | |
parent | eaae2ea735933bcf57227956ab9bcd8464d1519a (diff) |
Merge remote-tracking branches 'asoc/topic/pxa', 'asoc/topic/qcom' and 'asoc/topic/rockchip' into asoc-next