git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff0ff84 f5284e7)
Merge branch 'linus' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Thu, 8 Apr 2010 07:06:12 +0000 (09:06 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 8 Apr 2010 08:18:47 +0000 (10:18 +0200)
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>

Trivial merge
Pandora Kernel Repository