diff options
| author | Linus Torvalds | 2012-12-12 03:18:58 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2012-12-12 03:18:58 +0100 |
| commit | da830e589a45f0c42eef6f3cbd07275f8893f181 (patch) | |
| tree | b241c86b8a0f9acdef4b90f69ddd200548e91f2c /arch/s390/include/asm/cputime.h | |
| parent | Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| download | kernel-qcow2-linux-da830e589a45f0c42eef6f3cbd07275f8893f181.tar.gz kernel-qcow2-linux-da830e589a45f0c42eef6f3cbd07275f8893f181.tar.xz kernel-qcow2-linux-da830e589a45f0c42eef6f3cbd07275f8893f181.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:
"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 'arch/s390/include/asm/cputime.h')
0 files changed, 0 insertions, 0 deletions