From: Ingo Molnar Date: Tue, 11 Nov 2008 08:58:36 +0000 (+0100) Subject: Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core X-Git-Tag: v2.6.29-rc1~586^2~77 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d844222a54c33a960755b44b934cd1b01b05dceb;p=karo-tx-linux.git Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core ---