From: Ingo Molnar Date: Thu, 25 Dec 2008 12:11:00 +0000 (+0100) Subject: Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'tracing/ring-buffer... X-Git-Tag: v2.6.29-rc1~586^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5250d329e38cdf7580faeb9c53c17d3588d7d19c;p=linux-2.6-omap-h63xx.git Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'tracing/ring-buffer'; commit 'v2.6.28' into tracing/core --- 5250d329e38cdf7580faeb9c53c17d3588d7d19c