diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-08 12:11:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-08 12:11:33 -0400 |
commit | b1e25f41094dfe0b9653c926d3c02a35c2eb249c (patch) | |
tree | 6ccbd499bd62f8ac46ce4335803c6ab4fad57ae4 /scripts/kallsyms.c | |
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
Diffstat (limited to 'scripts/kallsyms.c')
0 files changed, 0 insertions, 0 deletions