summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-03-17 13:22:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-03-17 13:22:29 -0700
commit13326e5a620df5063df2e87b38d923785066ee63 (patch)
tree01e139b245cbc95416511c726758bee6b80d74b4 /kernel
parent8e6e44fbd230b12c34c9166ec49f63a5bd6018b7 (diff)
parentd415a7f1c1a8406b22d95b943c66a5b73a37bc19 (diff)
parent9ab2b7f3acfa5490f36c9e5774a2bfecd01943db (diff)
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