Merge branch 'topic/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

author Jaroslav Kysela <perex@perex.cz>

Tue, 16 Feb 2010 10:25:03 +0000 (11:25 +0100)

committer Jaroslav Kysela <perex@perex.cz>

Tue, 16 Feb 2010 10:25:03 +0000 (11:25 +0100)
author Jaroslav Kysela <perex@perex.cz>
Tue, 16 Feb 2010 10:25:03 +0000 (11:25 +0100)
committer Jaroslav Kysela <perex@perex.cz>
Tue, 16 Feb 2010 10:25:03 +0000 (11:25 +0100)
diff --cc sound/oss/soundcard.c
Simple merge
diff --cc sound/pci/ctxfi/ctatc.c
Simple merge
diff --cc sound/usb/usbaudio.c
Simple merge
diff --cc sound/usb/usbquirks.h
Simple merge
author	Jaroslav Kysela <perex@perex.cz>
	Tue, 16 Feb 2010 10:25:03 +0000 (11:25 +0100)
committer	Jaroslav Kysela <perex@perex.cz>
	Tue, 16 Feb 2010 10:25:03 +0000 (11:25 +0100)
		1	2
sound/oss/soundcard.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/ctxfi/ctatc.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/usb/usbaudio.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/usb/usbquirks.h	patch \|	diff1 \|	diff2 \|	blob \| history