Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Feb 2014 22:17:08 +0000 (14:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 23 Feb 2014 22:17:08 +0000 (14:17 -0800)
Pull timer fix from Thomas Gleixner:
 "Serialize the registration of a new sched_clock in the currently ARM
  only generic sched_clock facilty to avoid sched_clock havoc"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched_clock: Prevent callers from seeing half-updated data


Trivial merge