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

Merge branch 'linus' into locking/core, to fix up conflicts 



 Conflicts:
	mm/page_alloc.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents d82fed75 81a84ad3
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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