Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa

author Linus Torvalds <torvalds@g5.osdl.org>

Thu, 5 Jan 2006 00:38:36 +0000 (16:38 -0800)

committer Linus Torvalds <torvalds@g5.osdl.org>

Thu, 5 Jan 2006 00:38:36 +0000 (16:38 -0800)
author Linus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 00:38:36 +0000 (16:38 -0800)
committer Linus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 00:38:36 +0000 (16:38 -0800)
diff --cc MAINTAINERS
Simple merge
diff --cc include/linux/pci_ids.h
Simple merge
diff --cc sound/usb/usbaudio.c
Simple merge
diff --cc sound/usb/usx2y/usbusx2y.c
Simple merge
author	Linus Torvalds <torvalds@g5.osdl.org>
	Thu, 5 Jan 2006 00:38:36 +0000 (16:38 -0800)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Thu, 5 Jan 2006 00:38:36 +0000 (16:38 -0800)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	patch \|	diff1 \|	diff2 \|	blob \| history
sound/usb/usbaudio.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/usb/usx2y/usbusx2y.c	patch \|	diff1 \|	diff2 \|	blob \| history