Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@kernel.org>
Wed, 25 Apr 2012 10:33:24 +0000 (12:33 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 25 Apr 2012 10:33:24 +0000 (12:33 +0200)
commitc716ef56f1319e8a515cb1947a3ec59b06e94a5e
tree4434fc69dfbc9e8f4ddb1844cb460c45fbacf53a
parentb64909af1c1a441b31e8ffe812557a37103dd2d8
parentdb4c75cbebd7e5910cd3bcb6790272fcc3042857
Merge branch 'tip/perf/urgent-2' of git://git./linux/kernel/git/rostedt/linux-trace into perf/urgent