Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 9 Jun 2005 17:44:48 +0000 (10:44 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 9 Jun 2005 17:44:48 +0000 (10:44 -0700)

Trivial merge