Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 28 Jun 2005 21:59:07 +0000 (14:59 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 28 Jun 2005 21:59:07 +0000 (14:59 -0700)
commitadb2705a89e8b41abcf29c0ed86f4ce93ab36734
tree01d772570d58cce24b61874e711fd9f51e2729e7
parentf340c0d1a3f40fdcba69cd291530a4debc58748f
parent8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb
Merge /pub/scm/linux/kernel/git/gregkh/pci-2.6