Skip to content
Snippets Groups Projects
Commit c1ab9cab authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into tracing/core 


Conflicts:
	include/linux/module.h
	kernel/module.c

Semantic conflict:
	include/trace/events/module.h

Merge reason: Resolve the conflict with upstream commit 5fbfb18d ("Fix up
              possibly racy module refcounting")

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents ff0ff84a f5284e76
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 257 additions and 31 deletions
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