diff options
author | Mark Brown <broonie@kernel.org> | 2017-02-08 18:35:43 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-02-08 18:35:43 +0000 |
commit | b22ec509336d0f63c6dbe7a316c8c0edce8fad21 (patch) | |
tree | 3bd219fe6941232c2ce5edb0f855a7386c7ee722 /sound | |
parent | c691110376ea4eb165621fd7b02207d5c58735af (diff) | |
parent | ca8c7f233fa2c40e2a23f982dc33d947f28ad207 (diff) | |
parent | 8480ac567959eecdc694cf4f9c02d6fa687384b6 (diff) | |
parent | 31489c0b1d8b33e5b696ba18feb880617e937554 (diff) | |
parent | ac29a8f41740186aee601de99c729530e37ca77c (diff) |
Merge remote-tracking branches 'asoc/topic/atmel', 'asoc/topic/chmap', 'asoc/topic/cq93vc' and 'asoc/topic/da7218' into asoc-next