Merge branch 'topic/asoc' into for-linus

arch/arm/mach-davinci/board-dm365-evm.c

arch/arm/mach-omap2/mcbsp.c

arch/arm/mach-s3c2412/dma.c

arch/arm/plat-omap/include/plat/mcbsp.h

arch/arm/plat-omap/mcbsp.c

drivers/gpio/wm8994-gpio.c

drivers/mfd/Kconfig

drivers/mfd/Makefile

drivers/mfd/davinci_voicecodec.c

drivers/mfd/twl-core.c

drivers/mfd/wm831x-irq.c

drivers/mfd/wm8994-core.c

drivers/mfd/wm8994-irq.c

include/linux/i2c/twl.h

include/linux/mfd/davinci_voicecodec.h

include/linux/mfd/wm8350/audio.h

include/linux/mfd/wm8994/core.h

include/linux/mfd/wm8994/pdata.h

include/sound/soc-dai.h

include/sound/soc-dapm.h