Merge branch 'for-3.5' into for-3.6

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

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

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

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