Merge branch 'for-2.6.37' into for-2.6.38

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

Thu, 9 Dec 2010 11:29:13 +0000 (11:29 +0000)

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

Thu, 9 Dec 2010 11:29:13 +0000 (11:29 +0000)
author Mark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 9 Dec 2010 11:29:13 +0000 (11:29 +0000)
committer Mark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 9 Dec 2010 11:29:13 +0000 (11:29 +0000)
diff --cc sound/soc/codecs/wm8580.c
Simple merge
diff --cc sound/soc/codecs/wm8904.c
Simple merge
diff --cc sound/soc/codecs/wm8955.c
Simple merge
diff --cc sound/soc/codecs/wm8960.c
Simple merge
author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Thu, 9 Dec 2010 11:29:13 +0000 (11:29 +0000)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Thu, 9 Dec 2010 11:29:13 +0000 (11:29 +0000)
		1	2
sound/soc/codecs/wm8580.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wm8904.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wm8955.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wm8960.c	patch \|	diff1 \|	diff2 \|	blob \| history