Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Oct 2005 04:08:14 +0000 (21:08 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Oct 2005 04:08:14 +0000 (21:08 -0700)

Trivial merge