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: NIngo Molnar <mingo@elte.hu>