Merge branch 'x86/cleanups' into x86/urgent

Pull in some merge window leftovers.

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

diff --cc arch/x86/events/intel/lbr.c
Simple merge

diff --cc arch/x86/events/perf_event.h
Simple merge

diff --cc arch/x86/kernel/apic/apic.c
Simple merge

diff --cc arch/x86/kernel/cpu/common.c
Simple merge

diff --cc arch/x86/kernel/kgdb.c
Simple merge

diff --cc arch/x86/kernel/tsc.c
Simple merge

diff --cc arch/x86/kvm/mmu.c
Simple merge

diff --cc arch/x86/kvm/vmx.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc arch/x86/lib/memset_64.S
Simple merge

diff --cc arch/x86/mm/mpx.c
Simple merge

diff --cc arch/x86/mm/pat.c
Simple merge