Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

ce70a0b4

Commit ce70a0b4 authored 16 years ago by Ingo Molnar

Downloads
- Plain Diff

Merge branches 'tracing/blktrace', 'tracing/ftrace', 'tracing/urgent' and 'linus' into tracing/core

parents 939b3669 79fb0768 229c4ef8

Branches

Tags

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

kernel/trace/Kconfig 3 additions, 4 deletions

kernel/trace/Kconfig
kernel/trace/ftrace.c 5 additions, 0 deletions

kernel/trace/ftrace.c
kernel/trace/trace.c 55 additions, 10 deletions

kernel/trace/trace.c
kernel/trace/trace_boot.c 7 additions, 4 deletions

kernel/trace/trace_boot.c

with 70 additions and 18 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment