| commit | 8e9c4aa4e7bd600d30e15ec82be9b670a1ec3da9 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Thu Oct 03 17:29:05 2013 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Thu Oct 03 17:29:05 2013 +0100 |
| tree | 3b19eb54c684e36feab568078018dea31c43a79f | |
| parent | d60336e2f136287de821901d4a1b56179a0f7b69 [diff] | |
| parent | 1d73ad298d1bfeee5d77c19e5cd667c551e30632 [diff] |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-fsl Conflicts: sound/soc/fsl/fsl_ssi.c