diff options
author | Mark Brown <broonie@linaro.org> | 2013-06-14 10:16:06 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-06-14 10:16:06 +0100 |
commit | 384b8345589cbbb18a99ce1b112da90c58c802e8 (patch) | |
tree | 51fee39fa19adad6b24fb90123e7a0ca3159c9c5 /drivers/misc/mei | |
parent | 9c24b1672283644adf871244771ebf387dd73f90 (diff) | |
parent | 2e7ee15ced914e109a1a5b6dfcd463d846a13bd5 (diff) |
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 'drivers/misc/mei')
0 files changed, 0 insertions, 0 deletions