]> 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)
commit0dead57113ad539b1f7a8b48b536428a707adb81
tree3f231ff555a6785bd4120a4c6d2ccea1b3e656ea
parent7ec0f2dc6564451bb77422f1ee1a46b2f1e1941a
parent433606f778bea2422a852c066ce0dffa5051ef01
parent54d7cf44de42bac8a41f8ee5eea2b6f5484f7735
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