]> git.hungrycats.org Git - linux/commitdiff
Merge bk://ldm.bkbits.net/linux-2.5-pci
authorPatrick Mochel <mochel@segfault.osdl.org>
Tue, 7 May 2002 01:52:59 +0000 (18:52 -0700)
committerPatrick Mochel <mochel@segfault.osdl.org>
Tue, 7 May 2002 01:52:59 +0000 (18:52 -0700)
into segfault.osdl.org:/home/mochel/src/kernel/devel/linux-2.5-pci


Trivial merge