tree 767e77302ca8f2eb781c60624bc8518cd50ba6eb
parent ff0ff84a0767df48d728c36510365344a7e7d582
parent f5284e7635787224dda1a2bf82a4c56b1c75671f
author Ingo Molnar <mingo@elte.hu> 1270710372 +0200
committer Ingo Molnar <mingo@elte.hu> 1270714727 +0200

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>