Merge pull request #8576 from keszybz/oss-fuzz

author Evgeny Vereshchagin <evvers@ya.ru>

Tue, 27 Mar 2018 17:30:02 +0000 (20:30 +0300)

committer GitHub <noreply@github.com>

Tue, 27 Mar 2018 17:30:02 +0000 (20:30 +0300)
author Evgeny Vereshchagin <evvers@ya.ru>
Tue, 27 Mar 2018 17:30:02 +0000 (20:30 +0300)
committer GitHub <noreply@github.com>
Tue, 27 Mar 2018 17:30:02 +0000 (20:30 +0300)
diff --cc src/hwdb/hwdb.c
Simple merge
diff --cc src/udev/udevadm-hwdb.c
Simple merge
author	Evgeny Vereshchagin <evvers@ya.ru>
	Tue, 27 Mar 2018 17:30:02 +0000 (20:30 +0300)
committer	GitHub <noreply@github.com>
	Tue, 27 Mar 2018 17:30:02 +0000 (20:30 +0300)
		1	2
src/hwdb/hwdb.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/udev/udevadm-hwdb.c	patch \|	diff1 \|	diff2 \|	blob \| history