Merge branch 'for-2.6.37' into HEAD

author Mark Brown <broonie@opensource.wolfsonmicro.com>

Fri, 5 Nov 2010 13:16:07 +0000 (09:16 -0400)

committer Mark Brown <broonie@opensource.wolfsonmicro.com>

Fri, 5 Nov 2010 13:16:07 +0000 (09:16 -0400)
author Mark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 5 Nov 2010 13:16:07 +0000 (09:16 -0400)
committer Mark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 5 Nov 2010 13:16:07 +0000 (09:16 -0400)
diff --cc sound/soc/codecs/wm8962.c
Simple merge
diff --cc sound/soc/soc-core.c
Simple merge
author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Fri, 5 Nov 2010 13:16:07 +0000 (09:16 -0400)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Fri, 5 Nov 2010 13:16:07 +0000 (09:16 -0400)
		1	2
sound/soc/codecs/wm8962.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-core.c	patch \|	diff1 \|	diff2 \|	blob \| history