| commit | 8de3f7a70572c55201f02b9db804e8eef13cb840 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Apr 19 10:40:11 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Apr 19 10:40:11 2014 -0700 |
| tree | 601365917a673d3112e7f970b7a3997aab701aaf | |
| parent | b93124202fc10450a923e24cb052cacb40b2aa46 [diff] | |
| parent | 24223657806a0ebd0ae5c9caaf7b021091889cf2 [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