]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c07724e d4a6f3c)
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Oct 2010 15:05:33 +0000 (08:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Oct 2010 15:05:33 +0000 (08:05 -0700)
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched_stat: Update sched_info_queue/dequeue() code comments
  sched, cgroup: Fixup broken cgroup movement

1  2 
include/linux/sched.h patch | diff1 | diff2 | blob | history
kernel/sched.c patch | diff1 | diff2 | blob | history
kernel/sched_fair.c patch | diff1 | diff2 | blob | history

diff --cc include/linux/sched.h
Simple merge
diff --cc kernel/sched.c
Simple merge
diff --cc kernel/sched_fair.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.