]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 8 Dec 2010 13:54:33 +0000 (13:54 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 8 Dec 2010 13:54:33 +0000 (13:54 +0000)
commit3da51546c7a39969fe905ce933f6e6c964cc6068
tree0d84d5096b34bfb794b52dc59271c184e9d3e4ea
parentd6d48ccd4197136715df6c3aab70c8411119def3
parenta92810c59ca34870ea2bb9b8d62d9fdbff91ee0c
Merge branch 'for-2.6.37' into for-2.6.38

Conflicts:
sound/soc/soc-core.c

Axel's fix on two different branches.
sound/soc/codecs/wm8580.c
sound/soc/codecs/wm8962.c