Merge branch 'x86/cleanups' into x86/urgent

Pull in some merge window leftovers.

Signed-off-by: Ingo Molnar <mingo@kernel.org>