USB: fix up some odd parts due to partial merges
This page took 0.04301 seconds and 4 git commands to generate.