diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 21:18:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 21:18:58 -0500 |
| commit | da830e589a45f0c42eef6f3cbd07275f8893f181 (patch) | |
| tree | b241c86b8a0f9acdef4b90f69ddd200548e91f2c /kernel/cpu_pm.c | |
| parent | 090f8ccba37034cec5a5972a70abeaae7eb0222b (diff) | |
| parent | 08cd2a6960ae2e1aa7f44b44ebafa84f503a2dd1 (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:
"These are late-v3.7 pending fixes for tracing."
Fix up trivial conflict in kernel/trace/ring_buffer.c: the NULL pointer
fix clashed with the change of type of the 'ret' variable.
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
ring-buffer: Fix race between integrity check and readers
ring-buffer: Fix NULL pointer if rb_set_head_page() fails
ftrace: Clear bits properly in reset_iter_read()
Diffstat (limited to 'kernel/cpu_pm.c')
0 files changed, 0 insertions, 0 deletions