Merge master.kernel.org:/home/mochel/BK/linux-2.5
authorPatrick Mochel <mochel@osdl.org>
Wed, 29 May 2002 01:54:23 +0000 (18:54 -0700)
committerPatrick Mochel <mochel@osdl.org>
Wed, 29 May 2002 01:54:23 +0000 (18:54 -0700)
commit21a16f65b95259e28e99eb81977c790e77133ffb
tree8c7bf46d4cf7f13a5dd32aeb899f957df6ad4adc
parent83ca4c7e89ffc8fb30dd05754895dc381e0afbc6
parent4b4a837f2b57467de03001bb9003382d1c9a7f18
Merge master.kernel.org:/home/mochel/BK/linux-2.5
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-sync
drivers/pci/probe.c