]> git.neil.brown.name Git - history.git/commitdiff
Merge http://linuxusb.bkbits.net/pci-2.5
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Fri, 4 Oct 2002 07:37:57 +0000 (00:37 -0700)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Fri, 4 Oct 2002 07:37:57 +0000 (00:37 -0700)
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux


Trivial merge