]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a6b12e 10b9dd5)
Merge branch 'linus' into perf/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Thu, 24 Nov 2016 04:09:08 +0000 (05:09 +0100)
committerIngo Molnar <mingo@kernel.org>
Thu, 24 Nov 2016 04:09:08 +0000 (05:09 +0100)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
tools/perf/ui/browsers/hists.c patch | diff1 | diff2 | blob | history
tools/perf/util/hist.c patch | diff1 | diff2 | blob | history

diff --cc tools/perf/ui/browsers/hists.c
Simple merge
diff --cc tools/perf/util/hist.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.