Merge branch 'topic/usb-audio' into for-linus

author Takashi Iwai <tiwai@suse.de>

Mon, 23 Mar 2009 23:36:22 +0000 (00:36 +0100)

committer Takashi Iwai <tiwai@suse.de>

Mon, 23 Mar 2009 23:36:22 +0000 (00:36 +0100)
author Takashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:36:22 +0000 (00:36 +0100)
committer Takashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:36:22 +0000 (00:36 +0100)
diff --cc sound/usb/usbaudio.c
Simple merge
diff --cc sound/usb/usbmixer.c
Simple merge
diff --cc sound/usb/usbquirks.h
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Mon, 23 Mar 2009 23:36:22 +0000 (00:36 +0100)
committer	Takashi Iwai <tiwai@suse.de>
	Mon, 23 Mar 2009 23:36:22 +0000 (00:36 +0100)
		1	2
sound/usb/usbaudio.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/usb/usbmixer.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/usb/usbquirks.h	patch \|	diff1 \|	diff2 \|	blob \| history