Merge remote-tracking branch 'asoc/fix/fsl-ssi' into asoc-fsl
authorMark Brown <broonie@kernel.org>
Thu, 8 Jan 2015 19:54:56 +0000 (19:54 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 8 Jan 2015 19:54:56 +0000 (19:54 +0000)
commit4536a00116f084cf20ec77f3540c481c02ad8d0e
treeb88e70fe27ed37a34da32db041e2e06aacb85fdb
parentb968d83f09d8a4af1c178f504bc0414bbb37651d
parent64aa5f5843ab12455f6984928058a267f385a82c
Merge remote-tracking branch 'asoc/fix/fsl-ssi' into asoc-fsl

Conflicts:
sound/soc/fsl/fsl_ssi.c
sound/soc/fsl/fsl_ssi.c