Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/fsl-sai', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:54:53 +0000 (18:54 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:54:53 +0000 (18:54 +0100)
1  2  3  4  5  6 
sound/soc/fsl/fsl_sai.c
sound/soc/fsl/fsl_ssi.c

Simple merge
Simple merge