]> err.no Git - linux-2.6/commitdiff
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)
Yah, it does work to merge. Knock wood.


Trivial merge