Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 29 Feb 2008 18:19:27 +0000 (10:19 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 29 Feb 2008 18:19:27 +0000 (10:19 -0800)
commit076d84bbdb396360d16aaa108c55aa1e24ad47a3
tree7ea509f9d6160fafa9ed6bdadeae649e204a8337
parentd40e705903397445c6861a0a56c23e5b2e8f9b9a
parent7be2a03e3174cee3a3cdcdf17db357470f51caff
Merge git://git./linux/kernel/git/mingo/linux-2.6-sched

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
  softlockup: fix task state setting
  rcu: add support for dynamic ticks and preempt rcu