Merge branch 'linus' into oprofile-v2
authorIngo Molnar <mingo@elte.hu>
Mon, 13 Oct 2008 09:05:51 +0000 (11:05 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 13 Oct 2008 09:05:51 +0000 (11:05 +0200)
commitaccba5f3965d6a9d1bf7c1e1a7995d17e9d521b6
tree8fb40782e79472ed882ff2098d4dd295557278ee
parent6852fd9b86d05063c6ef49d2e12e061cc7f6a105
parent4480f15b3306f43bbb0310d461142b4e897ca45b
Merge branch 'linus' into oprofile-v2

Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/oprofile/nmi_int.c
include/linux/pci_ids.h
arch/Kconfig
arch/x86/kernel/apic_32.c
arch/x86/kernel/apic_64.c
arch/x86/oprofile/nmi_int.c
drivers/oprofile/cpu_buffer.c