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)
Conflicts:
arch/x86/kernel/apic_32.c
include/linux/pci_ids.h


Trivial merge