]> git.ipfire.org Git - people/ms/linux.git/commitdiff
projects / people / ms / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab53187 a57beec)
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Jan 2014 17:00:44 +0000 (09:00 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Jan 2014 17:00:44 +0000 (09:00 -0800)
Pull scheduler fixes from Ingo Molnar:
 "A crash fix and documentation updates"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched: Make sched_class::get_rr_interval() optional
  sched/deadline: Add sched_dl documentation
  sched: Fix docbook parameter annotation error in wait.h

1  2 
kernel/sched/core.c patch | diff1 | diff2 | blob | history

diff --cc kernel/sched/core.c
Simple merge
Michael's Linux tree.