Merge pull request #7855 from poettering/log-h-includes

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

Mon, 15 Jan 2018 09:43:09 +0000 (13:43 +0400)

committer GitHub <noreply@github.com>

Mon, 15 Jan 2018 09:43:09 +0000 (13:43 +0400)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 15 Jan 2018 09:43:09 +0000 (13:43 +0400)
committer GitHub <noreply@github.com>
Mon, 15 Jan 2018 09:43:09 +0000 (13:43 +0400)
diff --cc src/boot/bootctl.c
Simple merge
diff --cc src/core/dbus.c
Simple merge
diff --cc src/libsystemd/sd-bus/bus-socket.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Mon, 15 Jan 2018 09:43:09 +0000 (13:43 +0400)
committer	GitHub <noreply@github.com>
	Mon, 15 Jan 2018 09:43:09 +0000 (13:43 +0400)
		1	2
src/boot/bootctl.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/dbus.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/libsystemd/sd-bus/bus-socket.c	patch \|	diff1 \|	diff2 \|	blob \| history