From: Linus Torvalds Date: Thu, 16 Jan 2014 01:33:21 +0000 (+0700) Subject: Merge branches 'sched-urgent-for-linus' and 'timers-urgent-for-linus' of git://git... X-Git-Tag: v3.13~9 X-Git-Url: http://pileus.org/git/?p=~andy%2Flinux;a=commitdiff_plain;h=85ce70fdf48aa290b4845311c2dd815d7f8d1fa5 Merge branches 'sched-urgent-for-linus' and 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull scheduler and timer fixes from Ingo Molnar: "Contains a fix for a scheduler bug that manifested itself as a 3D performance regression and a crash fix for the ARM Cadence TTC clock driver" * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched: Calculate effective load even if local weight is 0 * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: clocksource: cadence_ttc: Fix mutex taken inside interrupt context --- 85ce70fdf48aa290b4845311c2dd815d7f8d1fa5