summaryrefslogtreecommitdiff
path: root/sound/soc/fsl/fsl_ssi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-10-06 12:48:59 +0100
committerMark Brown <broonie@kernel.org>2014-10-06 12:48:59 +0100
commit57b027f697c9d7c0356a53fb9e11e9f8d601fb5c (patch)
tree873bff17e1a37f041d343a85e403761205b129d4 /sound/soc/fsl/fsl_ssi.c
parent565fefdf31a58b5c07869fe598c3dcc69ed680d7 (diff)
parentd177143c3670aa57ee08c73880beb55ee9d8ab7c (diff)
parenteadb0019d206591e34e864b62059b292e157d8fc (diff)
parentb93427b1c057841602e0fe2005153a6e82f2e658 (diff)
parentbb78cdd4914df22bdf233a9cd4b554a1f6e39804 (diff)
downloadkernel-57b027f697c9d7c0356a53fb9e11e9f8d601fb5c.tar.gz
Merge remote-tracking branches 'asoc/topic/fsl-easi', 'asoc/topic/fsl-sai', 'asoc/topic/fsl-ssi' and 'asoc/topic/intel' into asoc-next