]> www.infradead.org Git - users/hch/xfs.git/commitdiff
projects / users / hch / xfs.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 294fe0f d525211)
Merge branch 'perf/urgent' into perf/core, to pick up fixes and to refresh the tree
authorIngo Molnar <mingo@kernel.org>
Fri, 27 Mar 2015 08:46:03 +0000 (09:46 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 27 Mar 2015 08:46:03 +0000 (09:46 +0100)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/events/core.c patch | diff1 | diff2 | blob | history
tools/perf/util/annotate.c patch | diff1 | diff2 | blob | history

diff --cc kernel/events/core.c
Simple merge
diff --cc tools/perf/util/annotate.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.