summaryrefslogtreecommitdiffstats
path: root/sound/soc/rockchip
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-10-06 13:49:02 +0200
committerMark Brown <broonie@kernel.org>2014-10-06 13:49:02 +0200
commit9568eaec6c16f909e806a3920699376ec147d8fa (patch)
tree4fd3de9dc7813e96c6905b04ddfa0d0db443b516 /sound/soc/rockchip
parentMerge remote-tracking branches 'asoc/topic/fsl-easi', 'asoc/topic/fsl-sai', '... (diff)
parentASoC: max98090: Remove unused byte access macros (diff)
parentASoC: rockchip-i2s: add dma data to snd_soc_dai (diff)
parentASoC: rsnd: delete unneeded test before of_node_put (diff)
parentASoC: rt286: Add depends on I2C (diff)
downloadlinux-9568eaec6c16f909e806a3920699376ec147d8fa.tar.xz
linux-9568eaec6c16f909e806a3920699376ec147d8fa.zip
Merge remote-tracking branches 'asoc/topic/max98090', 'asoc/topic/rockchip', 'asoc/topic/rsnd' and 'asoc/topic/rt286' into asoc-next