From: Linus Torvalds Date: Thu, 12 Jan 2012 06:52:48 +0000 (-0800) Subject: Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: firefly_0821_release~3680^2~3744 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=b8bf17d311c875de02550d5ce2af66588734159a;p=firefly-linux-kernel-4.4.55.git Merge branch 'sched-urgent-for-linus' of git://git./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 --- b8bf17d311c875de02550d5ce2af66588734159a