summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-03 10:34:23 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-03 10:34:23 +0100
commit7a895f53cda9d9362c30144e42c124a1ae996b9e (patch)
treee2a793cfc289015ec54d2cba5140d0171f734629 /init
parentftrace: ftrace_dump_on_oops=[tracer] (diff)
parentmarkers: break the redundant loop in kernel/marker.c (diff)
parenttrace: add the MMIO-tracer to the tracer menu, cleanup (diff)
parentftrace: nmi safe code clean ups (diff)
parenttracepoint: introduce *_noupdate APIs. (diff)
parenttracing, alpha: undefined reference to `save_stack_trace' (diff)
downloadlinux-7a895f53cda9d9362c30144e42c124a1ae996b9e.tar.xz
linux-7a895f53cda9d9362c30144e42c124a1ae996b9e.zip
Merge branches 'tracing/ftrace', 'tracing/markers', 'tracing/mmiotrace', 'tracing/nmisafe', 'tracing/tracepoints' and 'tracing/urgent' into tracing/core