diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2010-08-02 08:29:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-02 08:31:54 +0200 |
| commit | 3772b734720e1a3f2dc1d95cfdfaa5332f4ccf01 (patch) | |
| tree | a1a8cc85948c086aa12a1d8014151a7ca7c04ea8 /tools/perf/util/session.c | |
| parent | Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core (diff) | |
| parent | Linux 2.6.35 (diff) | |
| download | linux-dev-3772b734720e1a3f2dc1d95cfdfaa5332f4ccf01.tar.xz linux-dev-3772b734720e1a3f2dc1d95cfdfaa5332f4ccf01.zip | |
Merge commit 'v2.6.35' into perf/core
Conflicts:
tools/perf/Makefile
tools/perf/util/hist.c
Merge reason: Resolve the conflicts and update to latest upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions