diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-09 17:33:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-09 17:33:44 -0700 |
| commit | c23190c0bf1236e1eb5521a8b10d0102fbc1338c (patch) | |
| tree | eb23225a121fb56a58d69d34e7338bfe81ede644 /drivers/gpu/drm/nouveau/nv10_fence.h | |
| parent | fc335c1b68c68f626f07f1819e57d112d666bbba (diff) | |
| parent | 45ed695ac10a23cb4e60a3e0b68b3f21a8670670 (diff) | |
Merge tag 'trace-ipi-tracepoints' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull IPI tracepoints for ARM from Steven Rostedt:
"Nicolas Pitre added generic tracepoints for tracing IPIs and updated
the arm and arm64 architectures. It required some minor updates to
the generic tracepoint system, so it had to wait for me to implement
them"
* tag 'trace-ipi-tracepoints' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
ARM64: add IPI tracepoints
ARM: add IPI tracepoints
tracepoint: add generic tracepoint definitions for IPI tracing
tracing: Do not do anything special with tracepoint_string when tracing is disabled
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv10_fence.h')
0 files changed, 0 insertions, 0 deletions