From: Linus Torvalds Date: Mon, 25 Aug 2008 18:26:02 +0000 (-0700) Subject: Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: firefly_0821_release~18155 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cc556c5c92a45763e23015a31efb27005a6132fa;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_clock: fix cpu_clock() --- cc556c5c92a45763e23015a31efb27005a6132fa