From: Ingo Molnar Date: Tue, 17 Feb 2009 10:29:53 +0000 (+0100) Subject: Merge branches 'tracing/hw-branch-tracing' and 'tracing/power-tracer' into tracing... X-Git-Tag: v2.6.30-rc1~2^2~104 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c4e2b432d5b57e2faaeea048079b31c243079647;p=users%2Fdwmw2%2Flinux.git Merge branches 'tracing/hw-branch-tracing' and 'tracing/power-tracer' into tracing/core --- c4e2b432d5b57e2faaeea048079b31c243079647