Merge remote-tracking branches 'asoc/topic/doc', 'asoc/topic/dwc', 'asoc/topic/fsi...
authorMark Brown <broonie@kernel.org>
Wed, 4 Feb 2015 20:57:11 +0000 (20:57 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 4 Feb 2015 20:57:11 +0000 (20:57 +0000)
1  2  3  4  5  6 
sound/soc/dwc/designware_i2s.c
sound/soc/fsl/fsl_asrc.c

Simple merge
Simple merge