diff options
author | Mark Brown <broonie@kernel.org> | 2015-06-05 18:54:59 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-06-05 18:54:59 +0100 |
commit | cee77be0ad7e3730466887a0623456304aef873a (patch) | |
tree | c482761c08b9c800c4b376e31cc517235890d333 /sound/soc/samsung | |
parent | a178831a635b1a09316437fcdeb7eca2544a178f (diff) | |
parent | b3b10e99b73b5e079fdb9bdaa1dad43b53e330cd (diff) | |
parent | 1a3e2f1d6f65cb7cfb1e504e4337f1d31510ca6f (diff) | |
parent | 1f39d9397f8a27becd2b72009865610a71c64b0f (diff) |
Merge remote-tracking branches 'asoc/topic/rt5677', 'asoc/topic/samsung' and 'asoc/topic/sgtl5000' into asoc-next