tree 0f29e4a97b83f591fba10843d0f9417f5fa9b093
parent ecefe4a1c3dcc802c23ef42de6caa08730cfc1a1
parent 9612633a21ae8424531caf977f0560f64285bf36
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1195157692 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1195157692 -0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
  sched: reorder SCHED_FEAT_ bits
  sched: make sched_nr_latency static
  sched: remove activate_idle_task()
  sched: fix __set_task_cpu() SMP race
  sched: fix SCHED_FIFO tasks & FAIR_GROUP_SCHED
  sched: fix accounting of interrupts during guest execution on s390