merge
authorGreg Kroah-Hartman <greg@kroah.com>
Mon, 6 May 2002 07:15:27 +0000 (00:15 -0700)
committerGreg Kroah-Hartman <greg@kroah.com>
Mon, 6 May 2002 07:15:27 +0000 (00:15 -0700)
commit669f537e506f4b424805c7c69ee012d2652ba3db
tree39bf6d23c8ae29ae6508a20125b1cdb492e60724
parent702d27c75ce9c624d4015ea61d1cec85e9d140a9
parent1f8a622adc4dfc2ad8529c08f9935cff343f9bd7
merge
arch/i386/kernel/pci/common.c