]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitefc291f9444624b9e7e69d2b6647074711c36fec
treeb88e70fe27ed37a34da32db041e2e06aacb85fdb
parent02b8c0349878f1ef921d04698c45d9a8f90f7075
parent4f742a865d4e4a4580bdde67797fde187a628847
Merge remote-tracking branch 'asoc/fix/fsl-ssi' into asoc-fsl

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