]> git.neil.brown.name Git - history.git/commitdiff
Merge bk://linuxusb.bkbits.net/linus-2.5
authorLinus Torvalds <torvalds@athlon.transmeta.com>
Thu, 7 Feb 2002 07:08:11 +0000 (23:08 -0800)
committerLinus Torvalds <torvalds@athlon.transmeta.com>
Thu, 7 Feb 2002 07:08:11 +0000 (23:08 -0800)
into athlon.transmeta.com:/home/torvalds/v2.5/linux

1  2 
drivers/usb/usb-uhci.c

Simple merge