rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commit

]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commit

projects / can-eth-gw-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bb27f55 895b67f)

author	Ingo Molnar <mingo@kernel.org>
	Mon, 21 May 2012 07:44:36 +0000 (09:44 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Mon, 21 May 2012 07:44:36 +0000 (09:44 +0200)
commit	6f5e3577d47aeb4ef39683cbf9e201554bc7054d
tree	62450b0532cbf68a749d34bf45c2ad145fccbdb2	tree \| snapshot
parent	bb27f55eb9405257a59c82550dbb0d684cc3a665	commit \| diff
parent	895b67fd5830ce18a6f1375a7c062fcf84b4b874	commit \| diff

Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core

kernel/trace/trace.c