diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-04 11:54:29 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-04 11:54:29 +0000 |
| commit | 07ac582c85ead1b972232560832c26fec09dfe04 (patch) | |
| tree | 1ad64014dd6a5c898cdd9438844b630977d5e0ed /sound/soc/soc-utils.c | |
| parent | 0b4bbae85e046042af76a65920db4bb5509c97bd (diff) | |
| parent | 62e5f676f6a063e1ab0d6b8fcaef2feb026ee00e (diff) | |
| download | linux-07ac582c85ead1b972232560832c26fec09dfe04.tar.gz | |
Merge remote-tracking branch 'asoc/topic/symmetry' into asoc-core
Conflicts (Trivial add/delete):
sound/soc/soc-pcm.c
Diffstat (limited to 'sound/soc/soc-utils.c')
0 files changed, 0 insertions, 0 deletions