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

Merge branch 'linus' into core/percpu 

Conflicts:
	arch/x86/include/asm/fixmap_64.h
parents 3a450de1 16b71fdf
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