diff options
author | 2013-06-20 08:16:07 -1000 | |
---|---|---|
committer | 2013-06-20 08:16:07 -1000 | |
commit | 805e318548fa0f6007bcece06bde1ddd9393246c (patch) | |
tree | 421f6d22d9b57289110da25520f0104e0bd338b6 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
parent | idle: Enable interrupts in the weak arch_cpu_idle() implementation (diff) | |
download | wireguard-linux-805e318548fa0f6007bcece06bde1ddd9393246c.tar.xz wireguard-linux-805e318548fa0f6007bcece06bde1ddd9393246c.zip |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull cpu idle fixes from Thomas Gleixner:
- Add a missing irq enable. Fallout of the idle conversion
- Fix stackprotector wreckage caused by the idle conversion
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
idle: Enable interrupts in the weak arch_cpu_idle() implementation
idle: Add the stack canary init to cpu_startup_entry()
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions