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