tree a17fda13d9be51c71880a8ce2c55eaf7337c722f
parent 9ea1a153a4fb435c22e9988784bb476671286112
parent 4b221f0313f0f7f1f7aa0a1fd16ad400840def26
author Ingo Molnar <mingo@elte.hu> 1245511549 +0200
committer Ingo Molnar <mingo@elte.hu> 1245511549 +0200

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