Merge hera.kernel.org:/home/torvalds/BK/linux-2.5
authorPatrick Mochel <mochel@hera.kernel.org>
Tue, 16 Apr 2002 08:52:45 +0000 (01:52 -0700)
committerPatrick Mochel <mochel@hera.kernel.org>
Tue, 16 Apr 2002 08:52:45 +0000 (01:52 -0700)
commit5155207542aad7def6e452d2f8ae7f2539ced201
tree64d037c51bf50e16fa14c753d531b2a6aba3f939
parent91813920c82529b777b0feeff065bfc8d47a8783
parent9036d433bd2cacb1e0e34219649cd499b733a84d
Merge hera.kernel.org:/home/torvalds/BK/linux-2.5
into hera.kernel.org:/home/mochel/BK/linux-2.5-pci