Merge branch 'fix/wm8962' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Fri, 14 Jun 2013 09:16:06 +0000 (10:16 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 14 Jun 2013 09:16:06 +0000 (10:16 +0100)
commit384b8345589cbbb18a99ce1b112da90c58c802e8
tree51fee39fa19adad6b24fb90123e7a0ca3159c9c5
parent9c24b1672283644adf871244771ebf387dd73f90
parent2e7ee15ced914e109a1a5b6dfcd463d846a13bd5
Merge branch 'fix/wm8962' of git://git./linux/kernel/git/broonie/sound into asoc-wm8962

Conflicts:
sound/soc/codecs/wm8962.c
sound/soc/codecs/wm8962.c