Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorIngo Molnar <mingo@kernel.org>
Wed, 20 Feb 2013 10:26:21 +0000 (11:26 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 20 Feb 2013 10:26:21 +0000 (11:26 +0100)
commitff1fb5f6b4925a536ffb8171e5f2dbd01ccfeb97
treea88ff0074d2ff11fa71e653c2e74d6a47440975e
parent69943182bb9e19e4b60ea5033f683ec1af1703a9
parent8c189ea64eea01ca20d102ddb74d6936dd16c579
Merge branch 'tip/perf/core' of git://git./linux/kernel/git/rostedt/linux-trace into perf/urgent

Pull two fixes from Steven Rostedt.

Signed-off-by: Ingo Molnar <mingo@kernel.org>