From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 25 Aug 2007 18:25:29 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
X-Git-Tag: v2.6.23-rc4~11
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a3ce8ea66ae9379235334a989ed78a1ea518b0b3;p=~emulex%2Finfiniband.git

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: cleanup, sched_granularity -> sched_min_granularity
  sched: adaptive scheduler granularity
  sched: fix CONFIG_SCHED_DEBUG dependency of lockdep sysctls
---

a3ce8ea66ae9379235334a989ed78a1ea518b0b3