diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-11 11:24:44 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-11 11:24:44 +0800 |
| commit | 43a95197581ac58081772eab3bd5f114da87f98b (patch) | |
| tree | bc03d0cd7ca07f4b345c4d54d1293bed03ebc1c4 /sound/soc/codecs/stac9766.c | |
| parent | 7c08be84f83b23762fb7571ac9a4aea3c34d1a66 (diff) | |
| parent | 9fd369b193dceddd4e9e7f426c229c6104c80e28 (diff) | |
Merge branch 'for-3.2' into for-3.3
Conflicts:
sound/soc/mxs/mxs-pcm.c
Diffstat (limited to 'sound/soc/codecs/stac9766.c')
0 files changed, 0 insertions, 0 deletions