Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 5 Jul 2005 18:35:58 +0000 (11:35 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 5 Jul 2005 18:35:58 +0000 (11:35 -0700)
commit346fced899c7390e555cf90cd07d1e56b460d21b
tree4732fbdfc3bd40b5a2fd888bb741f42730e7c74d
parent17af691cd19765b782d891fc50c1568d0f1276b3
parent43a6b76050aa137c51d00eec91d67ac43ac3846e
Merge /pub/scm/linux/kernel/git/gregkh/pci-2.6