Merge branch 'fix/intel8x0' into for-linus