]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8cd2e5 676e1a2)
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)
1  2 
include/linux/pci_ids.h patch | diff1 | diff2 | blob | history

diff --cc include/linux/pci_ids.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.