]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 12e7953 06569f5)
Merge commit 'v2.6.32-rc6' into perf/core
authorIngo Molnar <mingo@elte.hu>
Wed, 4 Nov 2009 10:54:15 +0000 (11:54 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 4 Nov 2009 10:59:45 +0000 (11:59 +0100)
commit259cfba5346a8becdcbbc0837e9f440058504a8a
tree90d7139bea2f49e947f27af92614fa6eca50b64dtree | snapshot
parent12e795306994c116d7184e29b36b52ddf239e65ccommit | diff
parent06569f5994f91c576726e7c3260f2ae0d334e1f1commit | diff
Merge commit 'v2.6.32-rc6' into perf/core

Conflicts:
tools/perf/Makefile

Merge reason: Resolve the conflict, merge to upstream and merge in
              perf fixes so we can add a dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/linux/perf_event.h diff1 | diff2 | blob | history
kernel/perf_event.c diff1 | diff2 | blob | history
kernel/trace/ftrace.c diff1 | diff2 | blob | history
kernel/trace/ring_buffer.c diff1 | diff2 | blob | history
kernel/trace/trace.c diff1 | diff2 | blob | history
tools/perf/Makefile diff1 | diff2 | blob | history
tools/perf/util/symbol.c diff1 | diff2 | blob | history
tools/perf/util/symbol.h diff1 | diff2 | blob | history
Linux Kernel Source Tree.