Merge branch 'topic/misc' into for-linus

author Takashi Iwai <tiwai@suse.de>

Fri, 4 Dec 2009 15:22:37 +0000 (16:22 +0100)

committer Takashi Iwai <tiwai@suse.de>

Fri, 4 Dec 2009 15:22:37 +0000 (16:22 +0100)
author Takashi Iwai <tiwai@suse.de>
Fri, 4 Dec 2009 15:22:37 +0000 (16:22 +0100)
committer Takashi Iwai <tiwai@suse.de>
Fri, 4 Dec 2009 15:22:37 +0000 (16:22 +0100)
diff --cc sound/arm/aaci.c
Simple merge
diff --cc sound/core/control.c
Simple merge
diff --cc sound/isa/es18xx.c
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Fri, 4 Dec 2009 15:22:37 +0000 (16:22 +0100)
committer	Takashi Iwai <tiwai@suse.de>
	Fri, 4 Dec 2009 15:22:37 +0000 (16:22 +0100)
		1	2
sound/arm/aaci.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/core/control.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/isa/es18xx.c	patch \|	diff1 \|	diff2 \|	blob \| history