Merge branch 'for-3.5' into asoc-next

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

diff --cc sound/soc/soc-core.c
Simple merge

diff --cc sound/soc/soc-dapm.c
Simple merge