Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@kernel.org>
Mon, 21 May 2012 07:44:36 +0000 (09:44 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 21 May 2012 07:44:36 +0000 (09:44 +0200)
commit6f5e3577d47aeb4ef39683cbf9e201554bc7054d
tree62450b0532cbf68a749d34bf45c2ad145fccbdb2
parentbb27f55eb9405257a59c82550dbb0d684cc3a665
parent895b67fd5830ce18a6f1375a7c062fcf84b4b874
Merge branch 'tip/perf/core-2' of git://git./linux/kernel/git/rostedt/linux-trace into perf/core
kernel/trace/trace.c