]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 53072ab 58b077d)
Merge branch 'linus' into perf/core
authorIngo Molnar <mingo@kernel.org>
Sat, 8 Dec 2012 14:25:06 +0000 (15:25 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 8 Dec 2012 14:25:06 +0000 (15:25 +0100)
commit7ae7fca850f7e16dd9214a66a300db2b435e4367
tree7800081c5cb16a4dfee1e57a70f3be90f7b50d9atree | snapshot
parent53072ab779c2b99e215417cf3224d89b9eec71f8commit | diff
parent58b077dc2e4d19ebcb20e8812ea1a90660e6b381commit | diff
Merge branch 'linus' into perf/core

Conflicts:
tools/perf/Makefile
tools/perf/builtin-test.c
tools/perf/perf.h
tools/perf/tests/parse-events.c
tools/perf/util/evsel.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
14 files changed:
arch/x86/kernel/cpu/perf_event_p6.c diff1 | diff2 | blob | history
include/linux/kernel.h diff1 | diff2 | blob | history
tools/perf/Makefile diff1 | diff2 | blob | history
tools/perf/builtin-kvm.c diff1 | diff2 | blob | history
tools/perf/perf.h diff1 | diff2 | blob | history
tools/perf/tests/parse-events.c diff1 | | blob | history
tools/perf/util/evsel.c diff1 | diff2 | blob | history
tools/perf/util/evsel.h diff1 | diff2 | blob | history
tools/perf/util/header.c diff1 | diff2 | blob | history
tools/perf/util/header.h diff1 | diff2 | blob | history
tools/perf/util/parse-events.c diff1 | diff2 | blob | history
tools/perf/util/parse-events.h diff1 | diff2 | blob | history
tools/perf/util/pmu.h diff1 | diff2 | blob | history
tools/perf/util/session.h diff1 | diff2 | blob | history
Linux Kernel Source Tree.