tree 6ccbd499bd62f8ac46ce4335803c6ab4fad57ae4
parent 857505fae884fae32e700d4b019b5f652ebf0d3b
parent fad0c66c4bb836d57a5f125ecd38bed653ca863a
author Linus Torvalds <torvalds@linux-foundation.org> 1339171893 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1339171893 -0700

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/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