tree 601365917a673d3112e7f970b7a3997aab701aaf
parent b93124202fc10450a923e24cb052cacb40b2aa46
parent 24223657806a0ebd0ae5c9caaf7b021091889cf2
author Linus Torvalds <torvalds@linux-foundation.org> 1397929211 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1397929211 -0700

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fixes from Ingo Molnar:
 "Two kernel side fixes:

   - an Intel uncore PMU driver potential crash fix
   - a kprobes/perf-call-graph interaction fix"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel: Use rdmsrl_safe() when initializing RAPL PMU
  kprobes/x86: Fix page-fault handling logic