Merge branch 'topic/asoc' into for-next

author Takashi Iwai <tiwai@suse.de>

Tue, 18 May 2010 17:07:17 +0000 (19:07 +0200)

committer Takashi Iwai <tiwai@suse.de>

Tue, 18 May 2010 17:07:17 +0000 (19:07 +0200)
author Takashi Iwai <tiwai@suse.de>
Tue, 18 May 2010 17:07:17 +0000 (19:07 +0200)
committer Takashi Iwai <tiwai@suse.de>
Tue, 18 May 2010 17:07:17 +0000 (19:07 +0200)
diff --cc arch/arm/mach-omap2/mcbsp.c
Simple merge
diff --cc arch/arm/plat-omap/mcbsp.c
Simple merge
diff --cc sound/soc/codecs/tlv320dac33.c
Simple merge
diff --cc sound/soc/codecs/twl4030.c
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Tue, 18 May 2010 17:07:17 +0000 (19:07 +0200)
committer	Takashi Iwai <tiwai@suse.de>
	Tue, 18 May 2010 17:07:17 +0000 (19:07 +0200)
		1	2
arch/arm/mach-omap2/mcbsp.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/mcbsp.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/tlv320dac33.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/twl4030.c	patch \|	diff1 \|	diff2 \|	blob \| history