From: Ingo Molnar Date: Sun, 15 Feb 2009 19:08:55 +0000 (+0100) Subject: Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9abd60304816a5b0fd9e51034f78e3eaed89f901;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core Conflicts: kernel/trace/trace_mmiotrace.c --- 9abd60304816a5b0fd9e51034f78e3eaed89f901