summaryrefslogtreecommitdiff
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-10-26 09:45:52 +0200
committerMark Brown <broonie@kernel.org>2017-10-26 09:45:52 +0200
commit0bebd2f1bfcbf954a93b65d4b2848488fd049c78 (patch)
treec469cb3461de42b365bc8c634541917e7331d0ee /sound/soc/codecs
parentb64395f1892b25fa7cc866bc1fe91d14ef7da7ec (diff)
parentf3ee9096fcaf55eae37dfb58603c4dbff6f0a7c9 (diff)
parentd24e95f8757e9df5d7a9f56448e609cabe611d0a (diff)
Merge remote-tracking branches 'asoc/fix/topology' and 'asoc/fix/wm8998' into asoc-linus