]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf8962d041f3d5fc854f08c823201d718c4c1d6d3
tree65f0b2a66235d26eb92c54bea0ddaf8006bcb451
parent1d90667ed7ba5fd6e808d61b955cf3739dc8346e
parentfa6679855252050ccb3b21d33584fcb4fd41d8e3
Merge remote-tracking branch 'asoc/fix/debugfs' into asoc-component

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