diff options
author | Mark Brown <broonie@kernel.org> | 2016-12-12 15:53:18 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-12-12 15:53:18 +0000 |
commit | f617134f75bc52cd59bed0b0d43d8fa7fece689e (patch) | |
tree | e5ece92fd3766b1af01318dc6ad5ac0e229fb2ce /sound/soc/soc-jack.c | |
parent | b35ddfd41b116eb29c3971ac733f267289f6e3bb (diff) | |
parent | f2826c1fe5d071fa437d337c41df979b60f0fc32 (diff) | |
parent | d25280060835e1b2b84c242905da8334ab15c5b4 (diff) | |
parent | a40db07fbf6c47dd40aa6b5e0408e48cbae1338a (diff) | |
parent | 1bfbc260a5b474f1376bdfdfbc590f75645d62af (diff) | |
parent | 29a43aa9b4b609eba73e76c5fd92d435fc6e35ce (diff) | |
download | talos-obmc-linux-f617134f75bc52cd59bed0b0d43d8fa7fece689e.tar.gz talos-obmc-linux-f617134f75bc52cd59bed0b0d43d8fa7fece689e.zip |
Merge remote-tracking branches 'asoc/topic/rt5665', 'asoc/topic/rt5670', 'asoc/topic/rt5677', 'asoc/topic/samsung' and 'asoc/topic/simple' into asoc-next