From: Linus Torvalds Date: Thu, 21 Jan 2010 16:49:52 +0000 (-0800) Subject: Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: firefly_0821_release~9833^2~3312 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=341031caec0cd730e84d248d95851bf54ec4e41f;p=firefly-linux-kernel-4.4.55.git Merge branch 'sched-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: Reassign prev and switch_count when reacquire_kernel_lock() fail sched: Fix vmark regression on big machines --- 341031caec0cd730e84d248d95851bf54ec4e41f