tree 8fb40782e79472ed882ff2098d4dd295557278ee
parent 6852fd9b86d05063c6ef49d2e12e061cc7f6a105
parent 4480f15b3306f43bbb0310d461142b4e897ca45b
author Ingo Molnar <mingo@elte.hu> 1223888751 +0200
committer Ingo Molnar <mingo@elte.hu> 1223888751 +0200

Merge branch 'linus' into oprofile-v2

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