diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2016-04-28 10:35:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-04-28 10:35:17 +0200 |
| commit | 0b20e59cef927b030c2e626f40fc4965bacec847 (patch) | |
| tree | c090a7a4e2c20065eb5825debff1a724a7775b8a /include/linux/debugobjects.h | |
| parent | Merge tag 'perf-core-for-mingo-20160427' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core (diff) | |
| parent | perf/x86/intel: Fix incorrect lbr_sel_mask value (diff) | |
Merge branch 'perf/urgent' into perf/core, to resolve conflict
Conflicts:
arch/x86/events/intel/pt.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/debugobjects.h')
0 files changed, 0 insertions, 0 deletions