diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-11 04:24:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-11 04:24:44 +0100 |
| commit | 43a95197581ac58081772eab3bd5f114da87f98b (patch) | |
| tree | bc03d0cd7ca07f4b345c4d54d1293bed03ebc1c4 /sound/soc/codecs/wm8985.c | |
| parent | ASoC: Fix an obvious copy paste error in an error message (diff) | |
| parent | ASoC: mxs: Add appropriate MODULE_ALIAS() (diff) | |
| download | linux-43a95197581ac58081772eab3bd5f114da87f98b.tar.xz linux-43a95197581ac58081772eab3bd5f114da87f98b.zip | |
Merge branch 'for-3.2' into for-3.3
Conflicts:
sound/soc/mxs/mxs-pcm.c
Diffstat (limited to 'sound/soc/codecs/wm8985.c')
0 files changed, 0 insertions, 0 deletions