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