Merge branch 'tip/perf/urgent-3' 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 2010-11-18 08:07:36 +01:00
commit a89d4bd055
3 changed files with 36 additions and 5 deletions