Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Nov 2014 22:33:11 +0000 (14:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Nov 2014 22:33:11 +0000 (14:33 -0800)
Pull timer fix from Thomas Gleixner:
 "A single bugfix for an init order problem in the sun4i subarch
  clockevents code"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clockevent: sun4i: Fix race condition in the probe code


Trivial merge