Merge branch 'x86/oprofile' into oprofile

diff --cc arch/Kconfig
Simple merge

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

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

diff --cc arch/x86/oprofile/op_model_p4.c
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge