diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-08 09:11:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-08 09:11:33 -0700 |
| commit | b1e25f41094dfe0b9653c926d3c02a35c2eb249c (patch) | |
| tree | 6ccbd499bd62f8ac46ce4335803c6ab4fad57ae4 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge tag 'moduleparam-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus (diff) | |
| parent | timekeeping: Fix CLOCK_MONOTONIC inconsistency during leapsecond (diff) | |
| download | wireguard-linux-b1e25f41094dfe0b9653c926d3c02a35c2eb249c.tar.xz wireguard-linux-b1e25f41094dfe0b9653c926d3c02a35c2eb249c.zip | |
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 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions