Merge branch 'x86/fixmap' into x86/devel