author Linus Torvalds <torvalds@ppc970.osdl.org> 1117637793 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> 1117637793 -0700

Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
³