From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 19 Apr 2014 17:40:11 +0000 (-0700)
Subject: Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~176^2~4018
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8de3f7a70572c55201f02b9db804e8eef13cb840;p=firefly-linux-kernel-4.4.55.git

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

8de3f7a70572c55201f02b9db804e8eef13cb840