]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit1fe1be655eaa4ec69db45066453f9df54b1488f2
tree8fb40782e79472ed882ff2098d4dd295557278ee
parent991435b1647a9694a9134bb7746076d006e18cdf
parent749ebc12eb13b95742e9e3306878ddb83da2b46b
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