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

This commit is contained in:
Ingo Molnar 2011-01-15 15:23:27 +01:00
commit 7c46d8da09
2 changed files with 22 additions and 21 deletions