Merge branch 'for-4.7/xhci' into for-4.7/xusb