]> git.hungrycats.org Git - linux/commitdiff
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)
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-sync

1  2 
drivers/pci/probe.c

Simple merge