Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
commita3ce8ea66ae9379235334a989ed78a1ea518b0b3
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 25 Aug 2007 18:25:29 +0000 (25 11:25 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 25 Aug 2007 18:25:29 +0000 (25 11:25 -0700)
tree88bef2140c00ec607f2d222e953ed380999eb4a6
parentf2154eef2a926435cdf79156cd361092d6cba91e
parent172ac3dbb7d3e528ac53d08a34df88d1ac53c534
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:
  sched: cleanup, sched_granularity -> sched_min_granularity
  sched: adaptive scheduler granularity
  sched: fix CONFIG_SCHED_DEBUG dependency of lockdep sysctls