Merge branch 'x86/cleanups' into irq/sparseirq