Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1