tree 48765b70c65e80d62f0ce11a3245b4ef2299b060
parent c1ab9cab75098924fa8226a8a371de66977439df
parent aa27497c2fb4c7f57706099bd489e683e5cc3e3b
author Ingo Molnar <mingo@elte.hu> 1271240123 +0200
committer Ingo Molnar <mingo@elte.hu> 1271240123 +0200

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