tree 19b3cd50345306de6f95b58b4a35e8f725786b9b
parent 167b7129042a4b4c09bb4ede5482ff79340a3999
parent 02f726949f2be0967aa4871dd4e47d3967779b26
author Linus Torvalds <torvalds@linux-foundation.org> 1275605271 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1275605271 -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, 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