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)
commit62d3af1b5f3aa613e0a489e8d798d45b07f373f4
tree8f10dfd23c18600392965b69f94dd389e60827d5
parent942b6f62164cf8822dd03b1569777f4663d1abd7
parente71180f3689e00c5a1095925352a72dacdd62e34
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/netdev-2.6
MAINTAINERS
include/linux/pci_ids.h