Merge branch 'for-3.1' into for-3.2

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

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

diff --cc sound/soc/samsung/speyside_wm8962.c
Simple merge