]> www.infradead.org Git - users/hch/xfs.git/commitdiff
projects / users / hch / xfs.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f9c5d04 dd68e88)
Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 7 Jan 2006 18:44:22 +0000 (10:44 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 7 Jan 2006 18:44:22 +0000 (10:44 -0800)
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.