From: Linus Torvalds 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: MMI-PSA29.97-13-9~40645 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a3ce8ea66ae9379235334a989ed78a1ea518b0b3;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 --- a3ce8ea66ae9379235334a989ed78a1ea518b0b3