]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
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)
commitb8bf17d311c875de02550d5ce2af66588734159a
tree82d829df77f3eb506d10928fd633a8a6e5685082
parent9fc5c3e3237e02a94f41cd1d2b4291593d29791d
parentbced76aeaca03b45e3b4bdb868cada328e497847
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

* '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
init/Kconfig
kernel/sched/core.c