arch/x86/events/intel/lbr.c · 36db171cc733bc7b8c628ef21831467d1919decd · nexedi / linux · GitLab

Find file Blame History Permalink

Merge branch 'perf/urgent' into perf/core, to resolve conflict · 0b20e59c
Ingo Molnar authored Apr 28, 2016
```
 Conflicts:
	arch/x86/events/intel/pt.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
```
0b20e59c

lbr.c 27.3 KB