Merge with Greg's USB tree at kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6...
authorLinus Torvalds <torvalds@ppc970.osdl.org.(none)>
Tue, 19 Apr 2005 14:28:57 +0000 (07:28 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org.(none)>
Tue, 19 Apr 2005 14:28:57 +0000 (07:28 -0700)
commita9e4820c4c170b3df0d2185f7b4130b0b2daed2c
tree962bc52ba0e8e585d88e1fb9a9be9a67072767dd
parentc0698f2f6e4839ce9463ce731c892993215ea067
parente838a0d4d5260bce452c96914a6e86b217c53c55
Merge ... Greg's USB tree at /linux/kernel/git/gregkh/usb-2.6.git/

Yah, it does work to merge. Knock wood.