summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-07-24 22:07:48 +0100
committerMark Brown <broonie@kernel.org>2016-07-24 22:07:48 +0100
commite7ca8fcd15049b1e48ae2ef1434a68a51ef0ead5 (patch)
tree62d92076c83cac9cd45d49f8ccd4a9a4784fa23a /sound
parent1a946005b348fe4fbea9edfd02bc27b33752c08d (diff)
parenteb87f9e2b3212c84498c6972b529e207e4e95e6a (diff)
parentb82d67f4cf320b7ebe97799ffb0aa85e0172ab40 (diff)
downloadlinux-e7ca8fcd15049b1e48ae2ef1434a68a51ef0ead5.tar.bz2
Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/wm8985' into asoc-next