]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'sched-urgent-for-linus' and 'timers-urgent-for-linus' of git://git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jan 2014 01:33:21 +0000 (08:33 +0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jan 2014 01:33:21 +0000 (08:33 +0700)
commit4e78ebce2bbb26abcde51517d971f7c4b9756b29
tree3f231ff555a6785bd4120a4c6d2ccea1b3e656ea
parent0d484418553032a8c478688c3d341a32600375e0
parent4f12f7ed3affcb90450711f8e93a9bf1190edb78
parentcef8c58492d1ca1b109474d3752c89ee843f8c1b
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