diff options
author | Mark Brown <broonie@kernel.org> | 2017-02-19 16:36:18 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-02-19 16:36:18 +0000 |
commit | 59acd5dfcc1e786273beba2edb8645eb3ef01285 (patch) | |
tree | 04a51132b8661e3b187dbfff4bdfe497a89ce85e /sound/soc/soc-topology.c | |
parent | b7707a8be6a79b7ea2103c92da5ed5a56e9ba26d (diff) | |
parent | 3f81d9aa80ae4b513416440e416a6486ef2ad817 (diff) | |
parent | d6075c2601800a8a45bf6f7c3d87afa8598779b5 (diff) | |
parent | 8abab35f9a58e15b1f90a1371da69a207e40fc3b (diff) |
Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/debugfs' and 'asoc/topic/doc' into asoc-next