]> www.infradead.org Git - users/willy/linux.git/commitdiff
projects / users / willy / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fc5c3e bced76a)
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Jan 2012 06:52:48 +0000 (22:52 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Jan 2012 06:52:48 +0000 (22:52 -0800)
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched: Fix lockup by limiting load-balance retries on lock-break
  sched: Fix CONFIG_CGROUP_SCHED dependency
  sched: Remove empty #ifdefs

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

diff --cc init/Kconfig
Simple merge
diff --cc kernel/sched/core.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.