Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Oct 2005 18:25:16 +0000 (11:25 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Oct 2005 18:25:16 +0000 (11:25 -0700)
1  2 
MAINTAINERS
include/linux/pci_ids.h

diff --cc MAINTAINERS
Simple merge
Simple merge