Merge branch 'for-4.15/asus' into for-linus