Merge branch 'x86/oprofile' into oprofile
authorIngo Molnar <mingo@elte.hu>
Tue, 19 Aug 2008 01:34:07 +0000 (03:34 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 19 Aug 2008 01:34:07 +0000 (03:34 +0200)
commit2879a927bb7a3cf91ae3906a5e59215f9c17dd75
tree870bdd1bd530a3d5d2abd10539700446b2878188
parent7e7b43892b87b6be259479ef4de14029dcb4012f
parent20211e4d344729f4d4c93da37a590fc1c3a1fd9b
Merge branch 'x86/oprofile' into oprofile
arch/Kconfig
arch/x86/kernel/apic_32.c
arch/x86/kernel/apic_64.c
arch/x86/oprofile/op_model_p4.c
include/linux/pci_ids.h