diff options
author | Mark Brown <broonie@kernel.org> | 2016-12-12 15:52:51 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-12-12 15:52:51 +0000 |
commit | cc9624790d5f9c6c3bf8cd992706d97d3912290f (patch) | |
tree | a9cadda9e99f835a331bfe1250007fac2a3dd76c /include/sound/soc-dai.h | |
parent | ffe9c4f330328b884e51b8665b392ed6c538bf43 (diff) | |
parent | 2e622ae41e653cd71a6d3bc5a4685b01eacbee8d (diff) | |
parent | ddba7fa4cfd16b10adcbe24fa1d3b7de470af863 (diff) | |
parent | 914657c2be09fb89a50c7841e98186301c93767e (diff) |
Merge remote-tracking branches 'asoc/topic/compress', 'asoc/topic/const' and 'asoc/topic/cs35l34' into asoc-next