Merge branch 'for-3.2' into for-3.3

Conflicts:
	sound/soc/codecs/wm8940.c

diff --cc sound/soc/codecs/tlv320aic3x.c
Simple merge

diff --cc sound/soc/codecs/wm8904.c
Simple merge

diff --cc sound/soc/codecs/wm8940.c
Simple merge

diff --cc sound/soc/codecs/wm8962.c
Simple merge