Ingo Molnar c1ab9cab75 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 5fbfb18 ("Fix up
              possibly racy module refcounting")

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2010-04-08 10:18:47 +02:00

19 KiB

Raw Blame History

View Raw