summaryrefslogtreecommitdiff
path: root/sound/soc/fsl/fsl_ssi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-04 20:57:13 +0000
committerMark Brown <broonie@kernel.org>2015-02-04 20:57:13 +0000
commit4f1eacf5447c35daa29bc8ad828af0c21f903fda (patch)
treeb33d8f61da2d35943259b55e538a556a0d839a59 /sound/soc/fsl/fsl_ssi.c
parentd40d19447b602bf49d7909eb3c2fe6426fad98ce (diff)
parent7c27ba46792d3596a83f28243e235a92cba80d45 (diff)
parent7a3a907022439524704caecb717639aea2f1ef9c (diff)
parentc41cda1dbe50816d839c32271007c7b832d4d14a (diff)
parent5396ecf7b1920595deec83b902502bd3d2da184e (diff)
parent3a96878e6d01b70836cbf8a0e968619ef2e2aceb (diff)
downloadkernel-4f1eacf5447c35daa29bc8ad828af0c21f903fda.tar.gz
Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/imx', 'asoc/topic/intel', 'asoc/topic/mxs-saif' and 'asoc/topic/nuc900' into asoc-next