| commit | 211bcc6c3af90f3ee1f1297349d9d692e5f1c7e0 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Sat Jun 28 13:55:22 2014 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Sat Jun 28 14:47:12 2014 +0100 |
| tree | 65f0b2a66235d26eb92c54bea0ddaf8006bcb451 | |
| parent | 88a8fe3df65fa0229b04f1c03411062230091cdd [diff] | |
| parent | e73f3de5c5eb5285a1b1d8eed111eb229702b20f [diff] |
Merge remote-tracking branch 'asoc/fix/debugfs' into asoc-component Conflicts: sound/soc/soc-core.c