diff options
author | 2011-02-06 12:05:15 -0800 | |
---|---|---|
committer | 2011-02-06 12:05:15 -0800 | |
commit | f0adc82064a5c28b34bdbc18e2d178c32094770b (patch) | |
tree | 42c051d53c978c722687a2dc341f2b54db271417 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
parent | Merge branch 'timers/locking' (diff) | |
download | wireguard-linux-f0adc82064a5c28b34bdbc18e2d178c32094770b.tar.xz wireguard-linux-f0adc82064a5c28b34bdbc18e2d178c32094770b.zip |
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
lockdep, timer: Fix del_timer_sync() annotation
RTC: Prevents a division by zero in kernel code.
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions