]> 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)
commit72c41e6c136b30ea398149929e143d7845ed30bb
tree51fee39fa19adad6b24fb90123e7a0ca3159c9c5
parent39e96f89232c1ef5954da7bae7b1c5f2eddaf3f4
parent5e45d1eb2174c7e4b884e3010e3365cd3038fa2a
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