Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...

ASoC: Fixes for v3.7

Nothing too exciting except for the ams-delta change which is relatively
lerge due to the fact that the driver loading had been totally broken as
the driver needed a newer API to function.

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