Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 22:57:32 +0000 (15:57 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 22:57:32 +0000 (15:57 -0700)
commit7efe5d7c3e3a82e43b0f8fb29c6797317bce7a9a
tree2e246004dfc130947574e340a4968239b3f2d20b
parentdbe0580d0d2fccf63b0349840a7ae3dbb16f3074
parentf8977d0a9b7ac84cfe700278a2ca64cb33c93a13
Merge /pub/scm/linux/kernel/git/gregkh/pci-2.6