Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@elte.hu>
Thu, 16 Jun 2011 11:26:23 +0000 (13:26 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 16 Jun 2011 11:26:23 +0000 (13:26 +0200)
commitaf07ce3e77d3b24ab1d71fcc5833d41800f23b2b
treef464a6df26e0b62ba23c22de954cd58fb9a59aaa
parentb4f9f2b64aa189c5584f266f4f0343af7a705441
parent0ef5bf1cd3bd2e3eacb11fca80efe3674927ed1a
Merge branch 'tip/perf/core-2' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into perf/core

Conflicts:
Makefile
Makefile