summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-10-06 13:48:54 +0200
committerMark Brown <broonie@kernel.org>2014-10-06 13:48:54 +0200
commit1e9ca6857cee968f2af3a7be09418dfe27e81dce (patch)
tree82abf4576990015eca7ca276f02f31b516d84260 /include
parentMerge remote-tracking branch 'asoc/topic/fsl-esai' into asoc-next (diff)
parentASoC: ab8500-codec: Revert back to regmap (diff)
parentASoC: ac97-codec: Remove ASoC level IO support (diff)
parentASoC: cs35l32: remove second linux/slab.h inclusion (diff)
downloadlinux-1e9ca6857cee968f2af3a7be09418dfe27e81dce.tar.xz
linux-1e9ca6857cee968f2af3a7be09418dfe27e81dce.zip
Merge remote-tracking branches 'asoc/topic/ab8500', 'asoc/topic/ac97' and 'asoc/topic/cs35l32' into asoc-next