aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-01-16 08:33:21 +0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-16 08:33:21 +0700
commit85ce70fdf48aa290b4845311c2dd815d7f8d1fa5 (patch)
tree3f231ff555a6785bd4120a4c6d2ccea1b3e656ea
parent9b6c4ea95ff87464e012f70b119601de9e94deac (diff)
parent9722c2dac708e9468cc0dc30218ef76946ffbc9d (diff)
parente59da0aedb573a347fa501fa63d3ff5055aa1bc7 (diff)
downloadlinux-85ce70fdf48aa290b4845311c2dd815d7f8d1fa5.tar.gz
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