diff options
author | Mark Brown <broonie@kernel.org> | 2017-12-20 15:43:15 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-12-20 15:43:15 +0000 |
commit | 8dc7e208c759b384e09a0ecf68e45e69621317ef (patch) | |
tree | f8c7d5583357ece40db8b1e0fb26500e18933ebe /sound/soc | |
parent | 38acd9b8acf90f0cce094e1f5465522a96a66c67 (diff) | |
parent | 958d022e326810fd762505bd02007aced79ffcbc (diff) | |
parent | 737e0b7b67bdfe24090fab2852044bb283282fc5 (diff) | |
parent | 15f8c5f2415bfac73f33a14bcd83422bcbfb5298 (diff) |
Merge remote-tracking branches 'asoc/fix/rt5663', 'asoc/fix/tlv320aic31xx' and 'asoc/fix/twl4030' into asoc-linus