tree d414ab9a0f0995899c2e76c232714410f787b209
parent a340ba1071ccec7da5d5c689471ff8bc07fe022d
parent 06299db3e7f857a4985cf70dc1a5049ec12482c1
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