Merge branch 'for-3.7' into asoc-next

Conflicts:
	sound/soc/omap/am3517evm.c

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

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

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

diff --cc sound/soc/ux500/ux500_msp_i2s.c
Simple merge