From: Linus Torvalds <torvalds@ppc970.osdl.org.(none)>
Date: Tue, 19 Apr 2005 14:28:57 +0000 (-0700)
Subject: Merge with Greg's USB tree at kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6... 
X-Git-Tag: v2.6.12-rc3~26
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9e4820c4c170b3df0d2185f7b4130b0b2daed2c;p=linux-2.6

Merge with Greg's USB tree at kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/

Yah, it does work to merge. Knock wood.
---

a9e4820c4c170b3df0d2185f7b4130b0b2daed2c