Merge remote-tracking branch 'sound-asoc/for-next'

diff --cc arch/arm/mach-omap1/board-ams-delta.c
Simple merge

diff --cc sound/soc/omap/ams-delta.c
Simple merge

diff --cc sound/soc/omap/omap-abe-twl6040.c
Simple merge

diff --cc sound/soc/omap/omap-mcpdm.c
Simple merge