Merge tag 'v3.9-rc7' into asoc-dma

Linux 3.9-rc7

diff --cc include/sound/soc-dapm.h
Simple merge

diff --cc sound/soc/fsl/imx-ssi.c
Simple merge

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

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

diff --cc sound/soc/spear/spear_pcm.c
Simple merge

diff --cc sound/soc/tegra/tegra_pcm.c
Simple merge