From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 Jun 2012 16:11:33 +0000 (-0700)
Subject: Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~3680^2~2644
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b1e25f41094dfe0b9653c926d3c02a35c2eb249c;p=firefly-linux-kernel-4.4.55.git

Merge branch 'timers-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull leap second timer fix from Thomas Gleixner.

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timekeeping: Fix CLOCK_MONOTONIC inconsistency during leapsecond
---

b1e25f41094dfe0b9653c926d3c02a35c2eb249c