]> git.hungrycats.org Git - linux/commitdiff
Merge bk://linuxusb.bkbits.net/pci_hp-2.5
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Wed, 10 Apr 2002 06:16:24 +0000 (23:16 -0700)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Wed, 10 Apr 2002 06:16:24 +0000 (23:16 -0700)
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux


Trivial merge