From: Ingo Molnar Date: Thu, 24 Jan 2013 12:39:31 +0000 (+0100) Subject: Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... X-Git-Tag: firefly_0821_release~3680^2~1126^2~18 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4913ae3991acf00b414701852ee2193d1edd9c2d;p=firefly-linux-kernel-4.4.55.git Merge branch 'tip/perf/core' of git://git./linux/kernel/git/rostedt/linux-trace into perf/core Pull tracing updates from Steve Rostedt. This commit: tracing: Remove the extra 4 bytes of padding in events changes the ABI. All involved parties seem to agree that it's safe to do now, but the devil is in the details ... Signed-off-by: Ingo Molnar --- 4913ae3991acf00b414701852ee2193d1edd9c2d