]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit9c854c95c5df5d0e726a4de81cd8acc4e8930688
tree51fee39fa19adad6b24fb90123e7a0ca3159c9c5
parentbceab393b8611ff84e226915fb7fdf8f9b9d450d
parente3ed4286f76692139f307c8433328545f28576b6
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
sound/soc/codecs/wm8962.c