Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 00:38:36 +0000 (16:38 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 00:38:36 +0000 (16:38 -0800)
commit4da5cc2cec8caec1d357053e85a7a32f243f93a1
tree3f8b603af4af88f86be7ec1d4e3639a7fc9dd1a6
parent25c862cc9ea9b312c25a9f577f91b973131f1261
parentc6f43290ae687c11cdcd150d8bfeb57ec29cfa5b
Merge git://git./linux/kernel/git/perex/alsa
MAINTAINERS
include/linux/pci_ids.h
sound/usb/usbaudio.c
sound/usb/usx2y/usbusx2y.c