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-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~22380^2~303 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9abd60304816a5b0fd9e51034f78e3eaed89f901;p=linux-4.9.git Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core Conflicts: kernel/trace/trace_mmiotrace.c --- 9abd60304816a5b0fd9e51034f78e3eaed89f901