projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f2154ee 172ac3d)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 25 Aug 2007 18:25:29 +0000 (11:25 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 25 Aug 2007 18:25:29 +0000 (11:25 -0700)
* 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


Trivial merge
John Crispins staging tree