| commit | c1ab9cab75098924fa8226a8a371de66977439df | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Thu Apr 08 09:06:12 2010 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Thu Apr 08 10:18:47 2010 +0200 |
| tree | 767e77302ca8f2eb781c60624bc8518cd50ba6eb | |
| parent | ff0ff84a0767df48d728c36510365344a7e7d582 [diff] | |
| parent | f5284e7635787224dda1a2bf82a4c56b1c75671f [diff] |
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>