diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-07-30 14:51:06 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-07-30 14:51:06 +0200 |
| commit | f9b9f812235d53f774a083e88a5a23b517a69752 (patch) | |
| tree | 3f56a1a1e1e561e25317c7c3ede127d509961ffa /Documentation/zorro.txt | |
| parent | 068f1d3f45546f4bb24e9be67231db1be296f0c8 (diff) | |
| parent | 8578b891ec38c39abd5d6376afd05fce78e2628c (diff) | |
| download | talos-obmc-linux-f9b9f812235d53f774a083e88a5a23b517a69752.tar.gz talos-obmc-linux-f9b9f812235d53f774a083e88a5a23b517a69752.zip | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/core
Pull perf/core improvements and fixes from Jiri Olsa:
* Fix perf usage string leftover (Jiri Olsa)
* Revert "perf tools: Fix jump label always changing during tracing" (Jiri Olsa)
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/zorro.txt')
0 files changed, 0 insertions, 0 deletions
