]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit
projects / mirror_ubuntu-zesty-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 857505f fad0c66)
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jun 2012 16:11:33 +0000 (09:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jun 2012 16:11:33 +0000 (09:11 -0700)
commitb1e25f41094dfe0b9653c926d3c02a35c2eb249c
tree6ccbd499bd62f8ac46ce4335803c6ab4fad57ae4tree
parent857505fae884fae32e700d4b019b5f652ebf0d3bcommit | diff
parentfad0c66c4bb836d57a5f125ecd38bed653ca863acommit | diff
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
ubuntu-zesty-kernel mirror