Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorIngo Molnar <mingo@kernel.org>
Thu, 24 Jan 2013 12:39:31 +0000 (13:39 +0100)
committerIngo Molnar <mingo@kernel.org>
Thu, 24 Jan 2013 12:39:31 +0000 (13:39 +0100)
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 <mingo@kernel.org>

Trivial merge