Merge branch 'for-3.2' into for-3.3

author Mark Brown <[email protected]>

Mon, 12 Dec 2011 04:59:06 +0000 (12:59 +0800)

committer Mark Brown <[email protected]>

Mon, 12 Dec 2011 04:59:06 +0000 (12:59 +0800)
author Mark Brown <[email protected]>
Mon, 12 Dec 2011 04:59:06 +0000 (12:59 +0800)
committer Mark Brown <[email protected]>
Mon, 12 Dec 2011 04:59:06 +0000 (12:59 +0800)
diff --cc sound/soc/codecs/wm8958-dsp2.c
Simple merge
diff --cc sound/soc/pxa/hx4700.c
Simple merge
author	Mark Brown <[email protected]>
	Mon, 12 Dec 2011 04:59:06 +0000 (12:59 +0800)
committer	Mark Brown <[email protected]>
	Mon, 12 Dec 2011 04:59:06 +0000 (12:59 +0800)
		1	2
sound/soc/codecs/wm8958-dsp2.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/pxa/hx4700.c	patch \|	diff1 \|	diff2 \|	blob \| history