Merge pull request #2733 from elfiesmelfie/feat_pcie_aer

author Pavel Rochnyak <pavel2000@ngs.ru>

Thu, 5 Jul 2018 09:03:17 +0000 (16:03 +0700)

committer GitHub <noreply@github.com>

Thu, 5 Jul 2018 09:03:17 +0000 (16:03 +0700)
author Pavel Rochnyak <pavel2000@ngs.ru>
Thu, 5 Jul 2018 09:03:17 +0000 (16:03 +0700)
committer GitHub <noreply@github.com>
Thu, 5 Jul 2018 09:03:17 +0000 (16:03 +0700)
diff --cc Makefile.am
Simple merge
diff --cc configure.ac
Simple merge
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Pavel Rochnyak <pavel2000@ngs.ru>
	Thu, 5 Jul 2018 09:03:17 +0000 (16:03 +0700)
committer	GitHub <noreply@github.com>
	Thu, 5 Jul 2018 09:03:17 +0000 (16:03 +0700)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history