Merge branch 'fix/misc' into topic/misc

author Takashi Iwai <tiwai@suse.de>

Fri, 3 Sep 2010 20:38:52 +0000 (22:38 +0200)

committer Takashi Iwai <tiwai@suse.de>

Fri, 3 Sep 2010 20:38:52 +0000 (22:38 +0200)
author Takashi Iwai <tiwai@suse.de>
Fri, 3 Sep 2010 20:38:52 +0000 (22:38 +0200)
committer Takashi Iwai <tiwai@suse.de>
Fri, 3 Sep 2010 20:38:52 +0000 (22:38 +0200)
diff --cc sound/usb/card.c
Simple merge
diff --cc sound/usb/endpoint.c
Simple merge
diff --cc sound/usb/pcm.c
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Fri, 3 Sep 2010 20:38:52 +0000 (22:38 +0200)
committer	Takashi Iwai <tiwai@suse.de>
	Fri, 3 Sep 2010 20:38:52 +0000 (22:38 +0200)
		1	2
sound/usb/card.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/usb/endpoint.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/usb/pcm.c	patch \|	diff1 \|	diff2 \|	blob \| history