Merge branch 'linus' into x86/apic

Pull in update changes so we can apply conflicting patches