]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa-current
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Sep 2005 16:46:22 +0000 (09:46 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Sep 2005 16:46:22 +0000 (09:46 -0700)
commit63f3d1df1ad276a30b75339dd682a6e1f9d0c181
tree91240ae476d553bda4a92b52ff46823421798f6c
parenta8cd2e5045688157479a654786b2c08ab85f4d8f
parent676e1a2c1e7499eee8e7a81e577b4b6ba71ffb25
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa-current
include/linux/pci_ids.h