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)
commit4913ae3991acf00b414701852ee2193d1edd9c2d
treeb079652f0a897f86c5ecc16b2d4ba4bc3fefd220
parentff7532ca2c631e7e96dcd305a967b610259dc0ea
parent0b07436d95b5404134da4d661fd183eac863513e
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 <mingo@kernel.org>