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)
Conflicts:
sound/soc/codecs/wm8962.c


Trivial merge