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

Merge branch 'linus' into oprofile 

Conflicts:
	arch/x86/kernel/apic_32.c
	include/linux/pci_ids.h
parents 0d15504f 4480f15b
Hide whitespace changes
Inline Side-by-side
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