Merge branch 'topic/misc' into for-next

diff --cc sound/soc/davinci/davinci-sffsdr.c
Simple merge

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

diff --cc sound/soc/s3c24xx/neo1973_wm8753.c
Simple merge