diff options
author | Mark Brown <broonie@kernel.org> | 2017-05-26 12:42:37 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-05-26 12:42:37 +0100 |
commit | af2415ebb1df2ca3b3d9373b2355c69ccb733a4e (patch) | |
tree | 164dbc707b300a95b824be326e6a192c613f3d11 /sound | |
parent | 99c9fe336e9bf27c2e777bc0097922e5ebaefdb8 (diff) | |
parent | 2a54e845f6e5069666e1749bd952abdc0413910d (diff) | |
parent | 9f3b777f1de9ff5d17f7259b8f7da5e9d4303e87 (diff) | |
parent | fa1014302791a1e436387e93a90f38717d7f9b03 (diff) | |
parent | 155b8f3aa633dbce887cded6b6b9399a3c62683e (diff) |
Merge remote-tracking branches 'asoc/topic/hisi', 'asoc/topic/msm8916', 'asoc/topic/nau8824' and 'asoc/topic/of-graph' into asoc-next