The following commit has been merged in the linux branch: commit 37c2ca24119f7dd89cbbb43833df1e6c5fb3417b Merge: 6e958d73c25eecaf02a1998cda9ec8ce8da11042 2e600d01c131ee189f55ca1879cd364b9e056df8 Author: Linus Torvalds torvalds@linux-foundation.org Date: Thu Oct 29 08:12:00 2009 -0700

Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf timechart: Improve the visual appearance of scheduler delays perf timechart: Fix the wakeup-arrows that point to non-visible processes perf top: Fix --delay_secs 0 division by zero perf tools: Bump version to 0.0.2 perf_event: Adjust frequency and unthrottle for non-group-leader events