Merge http://gkernel.bkbits.net/net-drivers-2.5
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Thu, 7 Mar 2002 02:31:24 +0000 (18:31 -0800)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Thu, 7 Mar 2002 02:31:24 +0000 (18:31 -0800)
commit796297ff60390d887667b959c3ad23ccd6017344
treea87845deb764beddad296b3ef54be4ab2110af9f
parent58c1bd4cfd0f1d25e13043fb08841c0e848f381c
parent5b17799f9693ac1b8a12534c43672c7231ddaf77
Merge http://gkernel.bkbits.net/net-drivers-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
drivers/pci/pci.c