]> git.neil.brown.name Git - history.git/commitdiff
Merge master.kernel.org:/home/mochel/BK/linux-2.5-linus
authorPatrick Mochel <mochel@osdl.org>
Tue, 28 May 2002 14:03:13 +0000 (07:03 -0700)
committerPatrick Mochel <mochel@osdl.org>
Tue, 28 May 2002 14:03:13 +0000 (07:03 -0700)
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-linus

1  2 
drivers/pci/probe.c

Simple merge