summaryrefslogtreecommitdiffstats
path: root/sound/soc/rockchip
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-01-11 14:54:38 +0100
committerMark Brown <broonie@kernel.org>2016-01-11 14:54:38 +0100
commit5450487a0954f87607b14d52a71d44c147d2d0d5 (patch)
treee7eee7cd4ae4dfdc06199f98b278503add6cae46 /sound/soc/rockchip
parentMerge remote-tracking branches 'asoc/topic/fsl-asrc' and 'asoc/topic/fsl-ssi'... (diff)
parentASoC: rsnd: precedence error in rsnd_ssiu_init() (diff)
parentASoC: rockchip: i2s: Add SNDRV_PCM_FMTBIT_S32_LE support (diff)
downloadlinux-5450487a0954f87607b14d52a71d44c147d2d0d5.tar.xz
linux-5450487a0954f87607b14d52a71d44c147d2d0d5.zip
Merge remote-tracking branches 'asoc/topic/rcar' and 'asoc/topic/rockchip' into asoc-next