Merge remote-tracking branches 'asoc/fix/mtk', 'asoc/fix/psc', 'asoc/fix/pxa', 'asoc...

diff --cc sound/arm/Kconfig
Simple merge

diff --cc sound/soc/au1x/psc-i2s.c
Simple merge

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

diff --cc sound/soc/mediatek/mtk-afe-pcm.c
Simple merge

diff --cc sound/soc/pxa/Kconfig
Simple merge

diff --cc sound/soc/pxa/pxa2xx-ac97.c
Simple merge

diff --cc sound/soc/spear/Kconfig
Simple merge

diff --cc sound/soc/sti/uniperif_player.c
Simple merge

diff --cc sound/soc/sti/uniperif_reader.c
Simple merge