| commit | b1e25f41094dfe0b9653c926d3c02a35c2eb249c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 08 09:11:33 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 08 09:11:33 2012 -0700 |
| tree | 6ccbd499bd62f8ac46ce4335803c6ab4fad57ae4 | |
| parent | 857505fae884fae32e700d4b019b5f652ebf0d3b [diff] | |
| parent | fad0c66c4bb836d57a5f125ecd38bed653ca863a [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