diff options
author | Mark Brown <broonie@linaro.org> | 2013-06-14 11:16:06 +0200 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-06-14 11:16:06 +0200 |
commit | 384b8345589cbbb18a99ce1b112da90c58c802e8 (patch) | |
tree | 51fee39fa19adad6b24fb90123e7a0ca3159c9c5 /sound/soc/spear/spear_pcm.c | |
parent | ASoC: wm8962: Restore device state after reset in runtime resume (diff) | |
parent | ASoC: wm8962: Remove remaining direct register cache accesses (diff) | |
download | linux-384b8345589cbbb18a99ce1b112da90c58c802e8.tar.xz linux-384b8345589cbbb18a99ce1b112da90c58c802e8.zip |
Merge branch 'fix/wm8962' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-wm8962
Conflicts:
sound/soc/codecs/wm8962.c
Diffstat (limited to 'sound/soc/spear/spear_pcm.c')
0 files changed, 0 insertions, 0 deletions