projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4355f4c 1159cb5)
Merge branch 'collectd-5.8'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 19 Feb 2018 15:14:24 +0000 (16:14 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 19 Feb 2018 15:14:24 +0000 (16:14 +0100)
1  2 
src/intel_pmu.c patch | diff1 | diff2 | blob | history

diff --cc src/intel_pmu.c
Simple merge
collectd, the system statistics collection daemon