Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 May 2014 22:58:20 +0000 (15:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 May 2014 22:58:20 +0000 (15:58 -0700)
commitaa699a1d84474eb993867822b6aefc47a9a6ce0c
tree8a9ac250f1304f926d2421fe56f841d996a10a22
parent758b67126facde350bcbfbb1cd760aa6050f8647
parentacbf6d21ac81195071b97ebb114b0b37bd9fcc86
Merge branch 'timers-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull two timer fixes from Thomas Gleixner:
 "Two small fixlets for ARM SoC clocksource drivers:

   - avoid calling functions which might sleep from interrupt [disabled]
     context in tcb_clksrc used on Atmel SoCs

   - use irq_force_affinity() to pin the per cpu timer interrupt on a
     not yet online cpu in the SiRFprimaII driver"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource: tcb_clksrc: Make tc_mode interrupt safe
  clocksource: marco: Fix the affinity set for local timer of CPU1