Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@kernel.org>
Fri, 8 Jun 2012 10:23:22 +0000 (12:23 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 8 Jun 2012 10:23:22 +0000 (12:23 +0200)
commit9ee6ddc9dada9cc4b2201631bc74fbf203183a10
tree5ab664dc8c98387fbaa13e549af0f1b8a5f1a1fb
parentdb0dc75d6403b6663c0eab4c6ccb672eb9b2ed72
parentf2bf1f6f5f89d031245067512449fc889b2f4bb2
Merge branch 'tip/perf/urgent' of git://git./linux/kernel/git/rostedt/linux-trace into perf/urgent

Pull brown paper bag fix from Steve Rostedt.

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