Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes