diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-17 23:22:29 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-17 23:22:29 +0300 |
| commit | 13326e5a620df5063df2e87b38d923785066ee63 (patch) | |
| tree | 01e139b245cbc95416511c726758bee6b80d74b4 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | 8e6e44fbd230b12c34c9166ec49f63a5bd6018b7 (diff) | |
| parent | d415a7f1c1a8406b22d95b943c66a5b73a37bc19 (diff) | |
| parent | 9ab2b7f3acfa5490f36c9e5774a2bfecd01943db (diff) | |
| download | linux-13326e5a620df5063df2e87b38d923785066ee63.tar.xz | |
Merge branches 'perf-urgent-for-linus' and 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf and timer fixes from Ingo Molnar:
"Two small perf fixes:
- kernel side context leak fix
- tooling crash fix
And two clocksource driver fixes"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf: Fix context leak in put_event()
perf annotate: Fix fallback to unparsed disassembler line
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clockevents: sun5i: Fix setup_irq init sequence
clocksource: efm32: Fix a NULL pointer dereference