tree 4992850c7d5d5ed4034cbd4fe5f5ea23aeff317e
parent 6d8de3a26b5c20b04a9317b4446582167d5883da
parent b71e318cdb1dc301d734fdd4983dfc6dc167235a
author Linus Torvalds <torvalds@g5.osdl.org> 1126225262 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1126225262 -0700

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6