diff options
author | Mark Brown <broonie@kernel.org> | 2017-07-03 16:15:09 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-07-03 16:15:09 +0100 |
commit | be6054765c14333557ade067de5280177ac92a42 (patch) | |
tree | dd7938efafc90e24fd5e082d32730d9d60807ea8 /sound/soc/atmel/atmel-pcm.h | |
parent | f83ff1f4d2f37f5c74626e3c6a0eae06e4629fcf (diff) | |
parent | e4798d26548b264be6604b45e4281244e96c9a09 (diff) | |
parent | 7204e97685634813d8456f1900b7f38fa7701e60 (diff) | |
parent | 286345eef97ea8f4ea223410f025ed35f265e506 (diff) | |
parent | 664d00d187608c66904e62ff2f24e7df49611ba5 (diff) |
Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/drm', 'asoc/topic/dwc' and 'asoc/topic/es8316' into asoc-next