From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 8 Apr 2010 07:06:12 +0000 (+0200)
Subject: Merge branch 'linus' into tracing/core
X-Git-Tag: v2.6.35-rc1~523^2~10^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1ab9cab75098924fa8226a8a371de66977439df;p=pandora-kernel.git

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>
---

c1ab9cab75098924fa8226a8a371de66977439df
Reading git-diff-tree failed