summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-06-17 12:44:03 +0100
committerMark Brown <broonie@kernel.org>2016-06-17 12:44:03 +0100
commit1a7d46a9dfeb578ece0a707f9d97f7bd097cd4a4 (patch)
treebcfb3c3568fceb83817227e33cdbf8530ad14c0c /sound
parentdd7bb31751bb5ac1821e7e2f37dd9e2380b60b08 (diff)
parentcf5ef3a299ba32f6ac24c3c6ba18c1b7f1b5475f (diff)
parentb82d67f4cf320b7ebe97799ffb0aa85e0172ab40 (diff)
downloadlinux-next-1a7d46a9dfeb578ece0a707f9d97f7bd097cd4a4.tar.gz
Merge remote-tracking branches 'asoc/topic/wm8731' and 'asoc/topic/wm8985' into asoc-next