| commit | 4536a00116f084cf20ec77f3540c481c02ad8d0e | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@kernel.org> | Thu Jan 08 19:54:56 2015 +0000 |
| committer | Mark Brown <broonie@kernel.org> | Thu Jan 08 19:54:56 2015 +0000 |
| tree | b88e70fe27ed37a34da32db041e2e06aacb85fdb | |
| parent | b968d83f09d8a4af1c178f504bc0414bbb37651d [diff] | |
| parent | 64aa5f5843ab12455f6984928058a267f385a82c [diff] |
Merge remote-tracking branch 'asoc/fix/fsl-ssi' into asoc-fsl Conflicts: sound/soc/fsl/fsl_ssi.c