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

Merge branch 'linus' into x86/urgent

Merge needed to go past commit 7ca43e75

 (mm: use debug_kmap_atomic)
and fix it.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 3de46fda 4fe70410
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