diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2013-04-21 10:57:33 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-04-21 10:57:33 +0200 |
| commit | 73e21ce28d8d2b75140b742b01373c3a085ecc52 (patch) | |
| tree | add380154271f9a68be4099590f912b4ab4bed9f /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | Merge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc into perf/core (diff) | |
| parent | perf/x86: Fix offcore_rsp valid mask for SNB/IVB (diff) | |
| download | linux-dev-73e21ce28d8d2b75140b742b01373c3a085ecc52.tar.xz linux-dev-73e21ce28d8d2b75140b742b01373c3a085ecc52.zip | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
arch/x86/kernel/cpu/perf_event_intel.c
Merge in the latest fixes before applying new patches, resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions