Merge tag 'v3.7-rc3' into for-linus to sync up with recent USB changes