summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-07-24 17:18:22 +0200
committerMark Brown <broonie@kernel.org>2015-07-24 17:18:22 +0200
commit996034b117b467709dec7811ef134063934fa626 (patch)
treea1a55e035a07a552b3bfef8082c66ee3a4e9dbc1 /sound
parentMerge remote-tracking branches 'asoc/fix/fsl-ssi', 'asoc/fix/intel', 'asoc/fi... (diff)
parentASoC: sgtl5000: Fix up define for SGTL5000_SMALL_POP (diff)
parentASoC: topology: Fix to add dapm mixer info (diff)
parentASoC: zx: spdif: Fix devm_ioremap_resource return value check (diff)
downloadlinux-996034b117b467709dec7811ef134063934fa626.tar.xz
linux-996034b117b467709dec7811ef134063934fa626.zip
Merge remote-tracking branches 'asoc/fix/sgtl5000', 'asoc/fix/topology' and 'asoc/fix/zx' into asoc-linus