]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 72d8f5a a213e4f)
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Apr 2014 17:40:11 +0000 (10:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Apr 2014 17:40:11 +0000 (10:40 -0700)
commitcdc34f5e4a2d4049e612745e0e6d450b428fb138
tree601365917a673d3112e7f970b7a3997aab701aaftree | snapshot
parent72d8f5ae2314cc2589f35ad47a62d7d2ba534295commit | diff
parenta213e4f2735cd9dea0e2c5bfa6923667abd8c9c3commit | diff
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
Linux Kernel Source Tree.