Merge pull request #11449 from keszybz/udev-link-naming-again

author Lennart Poettering <lennart@poettering.net>

Thu, 17 Jan 2019 19:06:55 +0000 (20:06 +0100)

committer GitHub <noreply@github.com>

Thu, 17 Jan 2019 19:06:55 +0000 (20:06 +0100)
author Lennart Poettering <lennart@poettering.net>
Thu, 17 Jan 2019 19:06:55 +0000 (20:06 +0100)
committer GitHub <noreply@github.com>
Thu, 17 Jan 2019 19:06:55 +0000 (20:06 +0100)
diff --cc NEWS
Simple merge
diff --cc man/systemd.link.xml
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Thu, 17 Jan 2019 19:06:55 +0000 (20:06 +0100)
committer	GitHub <noreply@github.com>
	Thu, 17 Jan 2019 19:06:55 +0000 (20:06 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
man/systemd.link.xml	patch \|	diff1 \|	diff2 \|	blob \| history