summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-02-19 16:36:32 +0000
committerMark Brown <broonie@kernel.org>2017-02-19 16:36:32 +0000
commit64c37d50ad68442b0fcaec0afe7431a39391d1cb (patch)
treeb66957dd84072f40f777916855aa5870e2da2743 /sound
parent96f0e8a5b0979255e64ee8431f8287a41dc79140 (diff)
parentbfe48dffc80e530d5e61efcbf03637493c5ffc0e (diff)
parent1c445a42c48754bb5f821478517ef1b9f861217a (diff)
downloadlinux-64c37d50ad68442b0fcaec0afe7431a39391d1cb.tar.bz2
Merge remote-tracking branches 'asoc/topic/img' and 'asoc/topic/max98090' into asoc-next