Merge branch 'fix/asoc' into for-next

diff --cc sound/soc/samsung/neo1973_gta02_wm8753.c
Simple merge

diff --cc sound/soc/samsung/s3c24xx_simtec_hermes.c
Simple merge

diff --cc sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c
Simple merge

diff --cc sound/soc/samsung/s3c24xx_uda134x.c
Simple merge