diff options
author | Ingo Molnar | 2012-12-08 15:42:17 +0100 |
---|---|---|
committer | Ingo Molnar | 2012-12-08 15:42:47 +0100 |
commit | 08cd2a6960ae2e1aa7f44b44ebafa84f503a2dd1 (patch) | |
tree | b8a4f41686c3478f3b938155c866730164b8906c /arch/s390/include/asm/cputime.h | |
parent | Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
parent | ring-buffer: Fix race between integrity check and readers (diff) | |
download | kernel-qcow2-linux-08cd2a6960ae2e1aa7f44b44ebafa84f503a2dd1.tar.gz kernel-qcow2-linux-08cd2a6960ae2e1aa7f44b44ebafa84f503a2dd1.tar.xz kernel-qcow2-linux-08cd2a6960ae2e1aa7f44b44ebafa84f503a2dd1.zip |
Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent
Pull ftrace fixes from Steve Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390/include/asm/cputime.h')
0 files changed, 0 insertions, 0 deletions