diff options
author | Mark Brown <broonie@kernel.org> | 2018-01-12 12:29:37 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-01-12 12:29:37 +0000 |
commit | 535f9af41b8277309c8aea9a3f8c6fb06d63b6a5 (patch) | |
tree | 2f8ca864eb1262fea4cb3cd72262db1cdf100156 /sound/soc/codecs/Makefile | |
parent | d7502f7f6862c1641cda4798ce2a9ef8553f0ad9 (diff) | |
parent | 3511108a790fc8942448556b82046d6de945b80f (diff) | |
parent | 3bb0f7c31b1aedd0f85c675297031281799145d7 (diff) | |
parent | 93a00c467fe998bf5716cbc9cabc127046054782 (diff) | |
parent | c001bf633a910cfc8a5b84b80634db4636bf1724 (diff) | |
download | op-kernel-dev-535f9af41b8277309c8aea9a3f8c6fb06d63b6a5.zip op-kernel-dev-535f9af41b8277309c8aea9a3f8c6fb06d63b6a5.tar.gz |
Merge remote-tracking branches 'asoc/topic/tscs42xx', 'asoc/topic/twl4030', 'asoc/topic/twl6040' and 'asoc/topic/uda1380' into asoc-next