The following commit has been merged in the linux branch: commit bce8fc4cb796dc77ea71699ef88802879a177474 Merge: a5e3013d6612d2ed4aefdcd7920ae01df3b63b3a ec29b8d2af01912bb79adda8aeab4293539f29ac Author: Linus Torvalds torvalds@linux-foundation.org Date: Mon Nov 2 09:46:06 2009 -0800
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 tools: Remove -Wcast-align perf tools: Fix compatibility with libelf 0.8 and autodetect perf events: Don't generate events for the idle task when exclude_idle is set perf events: Fix swevent hrtimer sampling by keeping track of remaining time when enabling/disabling swevent hrtimers