Merge branch 'for-4.12/drivers' into for-next