Skip to content
Commit b30a72a7 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge branch 'x86/urgent' into x86/cpu 

Conflicts:

	arch/x86/kernel/cpu/cyrix.c
parents f1c5d30e c1b362e3
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