diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-21 14:07:23 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-21 14:07:23 +0100 |
| commit | 96200591a34f8ecb98481c626125df43a2463b55 (patch) | |
| tree | 314c376b01f254d04f9aaf449b1f9147ad177fa6 /net/lapb | |
| parent | 7031281e02bf951a2259849217193fb9d75a9762 (diff) | |
| parent | 68efa37df779b3e04280598e8b5b3a1919b65fee (diff) | |
| download | op-kernel-dev-96200591a34f8ecb98481c626125df43a2463b55.zip op-kernel-dev-96200591a34f8ecb98481c626125df43a2463b55.tar.gz | |
Merge branch 'tracing/hw-breakpoints' into perf/core
Conflicts:
arch/x86/kernel/kprobes.c
kernel/trace/Makefile
Merge reason: hw-breakpoints perf integration is looking
good in testing and in reviews, plus conflicts
are mounting up - so merge & resolve.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/lapb')
0 files changed, 0 insertions, 0 deletions
