Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...
authorTakashi Iwai <tiwai@suse.de>
Wed, 17 Oct 2012 12:09:15 +0000 (14:09 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 17 Oct 2012 12:09:15 +0000 (14:09 +0200)
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.

1  2 
arch/arm/mach-omap1/board-ams-delta.c
sound/soc/omap/ams-delta.c
sound/soc/omap/omap-abe-twl6040.c
sound/soc/omap/omap-mcpdm.c

Simple merge
Simple merge
Simple merge
Simple merge