The following commit has been merged in the linux branch: commit 6e958d73c25eecaf02a1998cda9ec8ce8da11042 Merge: 7811a32407b971d9086c46403124f1453b95c430 92f6a5e37a2e2d3342dafb2b39c2f8bc340bbf84 Author: Linus Torvalds torvalds@linux-foundation.org Date: Thu Oct 29 08:10:38 2009 -0700

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

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: Do less agressive buddy clearing sched: Disable SD_PREFER_LOCAL for MC/CPU domains