From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Mar 2015 20:22:29 +0000 (-0700)
Subject: Merge branches 'perf-urgent-for-linus' and 'timers-urgent-for-linus' of git://git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=13326e5a620df5063df2e87b38d923785066ee63;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branches 'perf-urgent-for-linus' and 'timers-urgent-for-linus' of git://git./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
---

13326e5a620df5063df2e87b38d923785066ee63