git://ftp.safe.ca / safe / jmp / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitc1ab9cab75098924fa8226a8a371de66977439df
tree767e77302ca8f2eb781c60624bc8518cd50ba6ebtree | snapshot
parentff0ff84a0767df48d728c36510365344a7e7d582commit | diff
parentf5284e7635787224dda1a2bf82a4c56b1c75671fcommit | 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>
include/linux/module.h diff1 | diff2 | blob | history
include/trace/events/module.h diff1 | diff2 | blob | history
kernel/module.c diff1 | diff2 | blob | history
kernel/trace/ring_buffer.c diff1 | diff2 | blob | history
kernel/trace/trace.c diff1 | diff2 | blob | history
kernel/trace/trace_functions_graph.c diff1 | diff2 | blob | history
kernel/trace/trace_selftest.c diff1 | diff2 | blob | history
Full containers within linux kernel