Merge pull request #2806 from rorysexton/dev_turbostat_plugin

author Pavel Rochnyak <pavel2000@ngs.ru>

Sat, 20 Oct 2018 11:17:11 +0000 (18:17 +0700)

committer GitHub <noreply@github.com>

Sat, 20 Oct 2018 11:17:11 +0000 (18:17 +0700)
author Pavel Rochnyak <pavel2000@ngs.ru>
Sat, 20 Oct 2018 11:17:11 +0000 (18:17 +0700)
committer GitHub <noreply@github.com>
Sat, 20 Oct 2018 11:17:11 +0000 (18:17 +0700)
diff --cc src/turbostat.c
Simple merge
diff --cc src/types.db
Simple merge
author	Pavel Rochnyak <pavel2000@ngs.ru>
	Sat, 20 Oct 2018 11:17:11 +0000 (18:17 +0700)
committer	GitHub <noreply@github.com>
	Sat, 20 Oct 2018 11:17:11 +0000 (18:17 +0700)
		1	2
src/turbostat.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/types.db	patch \|	diff1 \|	diff2 \|	blob \| history