Merge remote-tracking branch 'asoc/fix/debugfs' into asoc-component
authorMark Brown <broonie@linaro.org>
Sat, 28 Jun 2014 12:55:22 +0000 (13:55 +0100)
committerMark Brown <broonie@linaro.org>
Sat, 28 Jun 2014 13:47:12 +0000 (14:47 +0100)
commit211bcc6c3af90f3ee1f1297349d9d692e5f1c7e0
tree65f0b2a66235d26eb92c54bea0ddaf8006bcb451
parent88a8fe3df65fa0229b04f1c03411062230091cdd
parente73f3de5c5eb5285a1b1d8eed111eb229702b20f
Merge remote-tracking branch 'asoc/fix/debugfs' into asoc-component

Conflicts:
sound/soc/soc-core.c
sound/soc/soc-core.c