aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kernel/ds.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-25 17:30:25 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-25 17:30:30 +0100
commit7d55718b0c19ba611241c330f688ee824e9bab79 (patch)
tree7f1117dc44ac834d063b16c36d774d187646ab26 /arch/x86/kernel/ds.c
parent6f893fb2e89287a4d755f928c3cda9d18440355c (diff)
parentde90add30e79261c3b5be68bb0f22d2ef98e8113 (diff)
parentf4166c54bfe04f64603974058e44fbd7cfef0ccc (diff)
Merge branches 'tracing/core', 'x86/urgent' and 'x86/ptrace' into tracing/hw-branch-tracing
This pulls together all the topic branches that are needed for the DS/BTS/PEBS tracing work.