Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 28 Feb 2006 22:02:10 +0000 (14:02 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 28 Feb 2006 22:02:10 +0000 (14:02 -0800)

Trivial merge