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

Merge branch 'linus' into x86/core 



Conflicts:

	arch/x86/mm/ioremap.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents eca91e78 a26929fb
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