]> git.hungrycats.org Git - linux/commitdiff
Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 14 Jul 2004 11:01:31 +0000 (04:01 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 14 Jul 2004 11:01:31 +0000 (04:01 -0700)
into ppc970.osdl.org:/home/torvalds/v2.6/linux


Trivial merge