Merge branch 'linus' into oprofile
authorIngo Molnar <mingo@elte.hu>
Mon, 13 Oct 2008 08:52:30 +0000 (10:52 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 13 Oct 2008 08:52:30 +0000 (10:52 +0200)
commitc493756e2a8a78bcaae30668317890dcfe86e7c3
tree8fb40782e79472ed882ff2098d4dd295557278ee
parent0d15504f16f68725e4635aa85411015d1c573b0a
parent4480f15b3306f43bbb0310d461142b4e897ca45b
Merge branch 'linus' into oprofile

Conflicts:
arch/x86/kernel/apic_32.c
include/linux/pci_ids.h
arch/x86/kernel/apic_32.c
arch/x86/kernel/apic_64.c