Skip to content
Commit accba5f3 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into oprofile-v2

Conflicts:
	arch/x86/kernel/apic_32.c
	arch/x86/oprofile/nmi_int.c
	include/linux/pci_ids.h
parents 6852fd9b 4480f15b
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment