]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'perf/core'
authorIngo Molnar <mingo@kernel.org>
Fri, 11 Oct 2013 07:30:58 +0000 (09:30 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 11 Oct 2013 07:30:58 +0000 (09:30 +0200)
1  2 
kernel/sysctl.c
tools/perf/builtin-stat.c
tools/perf/util/session.c

diff --cc kernel/sysctl.c
Simple merge
Simple merge
Simple merge