diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-14 10:51:50 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-14 10:51:50 +0200 |
| commit | 169d5a83f687c37104d51cbaa639bdffca8a1cd3 (patch) | |
| tree | a0d49f301ef9067879eac5194a028288a641a1cd /sound/soc/soc-dapm.c | |
| parent | Merge branch 'for-3.0' into for-3.1 (diff) | |
| download | linux-169d5a83f687c37104d51cbaa639bdffca8a1cd3.tar.xz linux-169d5a83f687c37104d51cbaa639bdffca8a1cd3.zip | |
ASoC: Fix mismerge with release branch
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/soc-dapm.c')
0 files changed, 0 insertions, 0 deletions