]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jun 2010 22:47:51 +0000 (15:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jun 2010 22:47:51 +0000 (15:47 -0700)
commit39d112100e561686ab1e2b19c57984163ad6c1fa
tree19b3cd50345306de6f95b58b4a35e8f725786b9b
parent167b7129042a4b4c09bb4ede5482ff79340a3999
parent02f726949f2be0967aa4871dd4e47d3967779b26
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, trace: Fix sched_switch() prev_state argument
  sched: Fix wake_affine() vs RT tasks
  sched: Make sure timers have migrated before killing the migration_thread