summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-25 13:11:00 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-25 13:11:00 +0100
commit5250d329e38cdf7580faeb9c53c17d3588d7d19c (patch)
tree42b2d22e0dc9ae08a26167ba8f89cb3d9a8ad5af /kernel
parentMerge branch 'x86/tsc' into tracing/core (diff)
parentsched, trace: update trace_sched_wakeup() (diff)
parentRevert "x86: disable X86_PTRACE_BTS" (diff)
parentring-buffer: prevent false positive warning (diff)
parentLinux 2.6.28 (diff)
downloadlinux-5250d329e38cdf7580faeb9c53c17d3588d7d19c.tar.xz
linux-5250d329e38cdf7580faeb9c53c17d3588d7d19c.zip
Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'tracing/ring-buffer'; commit 'v2.6.28' into tracing/core