Merge pull request #3905 from htejun/cgroup-v2-cpu

author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Sun, 14 Aug 2016 22:03:35 +0000 (18:03 -0400)

committer GitHub <noreply@github.com>

Sun, 14 Aug 2016 22:03:35 +0000 (18:03 -0400)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sun, 14 Aug 2016 22:03:35 +0000 (18:03 -0400)
committer GitHub <noreply@github.com>
Sun, 14 Aug 2016 22:03:35 +0000 (18:03 -0400)
diff --cc src/core/load-fragment-gperf.gperf.m4
Simple merge
diff --cc src/shared/bus-unit-util.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Sun, 14 Aug 2016 22:03:35 +0000 (18:03 -0400)
committer	GitHub <noreply@github.com>
	Sun, 14 Aug 2016 22:03:35 +0000 (18:03 -0400)
		1	2
src/core/load-fragment-gperf.gperf.m4	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared/bus-unit-util.c	patch \|	diff1 \|	diff2 \|	blob \| history