Merge branches 'tracing/core', 'x86/urgent' and 'x86/ptrace' into tracing/hw-branch...
authorIngo Molnar <mingo@elte.hu>
Tue, 25 Nov 2008 16:30:25 +0000 (17:30 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 25 Nov 2008 16:30:30 +0000 (17:30 +0100)
commit7d55718b0c19ba611241c330f688ee824e9bab79
tree7f1117dc44ac834d063b16c36d774d187646ab26
parent6f893fb2e89287a4d755f928c3cda9d18440355c
parentde90add30e79261c3b5be68bb0f22d2ef98e8113
parentf4166c54bfe04f64603974058e44fbd7cfef0ccc
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.
arch/x86/kernel/Makefile
arch/x86/kernel/ds.c