]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
Conflicts:
sound/soc/soc-core.c

Axel's fix on two different branches.

1  2 
sound/soc/codecs/wm8580.c
sound/soc/codecs/wm8962.c

Simple merge
Simple merge