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

1  2 
drivers/usb/core/usb.c

Simple merge