diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-19 19:40:11 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-19 19:40:11 +0200 |
| commit | 8de3f7a70572c55201f02b9db804e8eef13cb840 (patch) | |
| tree | 601365917a673d3112e7f970b7a3997aab701aaf /drivers/misc/mei/main.c | |
| parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
| parent | perf/x86/intel: Use rdmsrl_safe() when initializing RAPL PMU (diff) | |
| download | linux-8de3f7a70572c55201f02b9db804e8eef13cb840.tar.xz linux-8de3f7a70572c55201f02b9db804e8eef13cb840.zip | |
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
Diffstat (limited to 'drivers/misc/mei/main.c')
0 files changed, 0 insertions, 0 deletions