summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-04-22 14:22:52 +0200
committerMark Brown <broonie@linaro.org>2014-04-22 14:22:52 +0200
commit2b17ef4071d37ef5e357a4ec75686315cfa9d3e6 (patch)
treea68506b8d4bcc765b5810bf5f5f232228b7dea1c /include/sound
parentASoC: Fix snd_soc_kcontrol_platform() return type (diff)
parentASoC: sta350: Use snd_soc_kcontrol_codec() (diff)
parentASoC: Change return type of snd_soc_write() to int (diff)
parentASoC: dapm: Allow update_bits use 32 bits reg (diff)
parentASoC: codec: fix the sparse check warnings. (diff)
downloadlinux-2b17ef4071d37ef5e357a4ec75686315cfa9d3e6.tar.xz
linux-2b17ef4071d37ef5e357a4ec75686315cfa9d3e6.zip
Merge branches 'topic/sta350', 'topic/core', 'topic/dapm' and 'topic/cache' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-component