Merge branch 'topic/pcm-dma-fix' into for-next

author Takashi Iwai <tiwai@suse.de>

Fri, 27 Nov 2009 16:46:34 +0000 (17:46 +0100)

committer Takashi Iwai <tiwai@suse.de>

Fri, 27 Nov 2009 16:46:34 +0000 (17:46 +0100)
author Takashi Iwai <tiwai@suse.de>
Fri, 27 Nov 2009 16:46:34 +0000 (17:46 +0100)
committer Takashi Iwai <tiwai@suse.de>
Fri, 27 Nov 2009 16:46:34 +0000 (17:46 +0100)
diff --cc arch/arm/mach-omap2/board-omap3beagle.c
Simple merge
diff --cc arch/arm/mach-omap2/board-omap3pandora.c
Simple merge
diff --cc arch/arm/mach-omap2/board-zoom2.c
Simple merge
diff --cc sound/arm/aaci.c
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Fri, 27 Nov 2009 16:46:34 +0000 (17:46 +0100)
committer	Takashi Iwai <tiwai@suse.de>
	Fri, 27 Nov 2009 16:46:34 +0000 (17:46 +0100)
		1	2
arch/arm/mach-omap2/board-omap3beagle.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3pandora.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-zoom2.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/arm/aaci.c	patch \|	diff1 \|	diff2 \|	blob \| history