]> git.baikalelectronics.ru Git - 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)
commit1c837f0b654a5613552aeac885d00d05b72700e1
tree82d829df77f3eb506d10928fd633a8a6e5685082
parent0187f158120f94fdd55f509974272ca7b7250fb5
parent098fa22281ff2c4a36432b29f0dfd7dc04dea5c5
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