Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa
Linus Torvalds [Thu, 5 Jan 2006 00:38:36 +0000 (16:38 -0800)]
1  2 
MAINTAINERS
include/linux/pci_ids.h
sound/usb/usbaudio.c
sound/usb/usx2y/usbusx2y.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge