Merge branch 'topic/asoc' into for-linus

author Takashi Iwai <tiwai@suse.de>

Mon, 21 May 2012 10:45:18 +0000 (12:45 +0200)

committer Takashi Iwai <tiwai@suse.de>

Mon, 21 May 2012 10:45:18 +0000 (12:45 +0200)
author Takashi Iwai <tiwai@suse.de>
Mon, 21 May 2012 10:45:18 +0000 (12:45 +0200)
committer Takashi Iwai <tiwai@suse.de>
Mon, 21 May 2012 10:45:18 +0000 (12:45 +0200)
diff --cc sound/soc/codecs/cs42l73.c
Simple merge
diff --cc sound/soc/codecs/wm8994.c
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Mon, 21 May 2012 10:45:18 +0000 (12:45 +0200)
committer	Takashi Iwai <tiwai@suse.de>
	Mon, 21 May 2012 10:45:18 +0000 (12:45 +0200)
		1	2
sound/soc/codecs/cs42l73.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wm8994.c	patch \|	diff1 \|	diff2 \|	blob \| history