Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

author Moritz Fischer <mdf@kernel.org>

Wed, 4 Sep 2019 02:35:07 +0000 (19:35 -0700)

committer Moritz Fischer <mdf@kernel.org>

Wed, 4 Sep 2019 02:35:07 +0000 (19:35 -0700)
author Moritz Fischer <mdf@kernel.org>
Wed, 4 Sep 2019 02:35:07 +0000 (19:35 -0700)
committer Moritz Fischer <mdf@kernel.org>
Wed, 4 Sep 2019 02:35:07 +0000 (19:35 -0700)
diff --cc drivers/fpga/Kconfig
Simple merge
diff --cc include/linux/device.h
Simple merge
author	Moritz Fischer <mdf@kernel.org>
	Wed, 4 Sep 2019 02:35:07 +0000 (19:35 -0700)
committer	Moritz Fischer <mdf@kernel.org>
	Wed, 4 Sep 2019 02:35:07 +0000 (19:35 -0700)
		1	2
drivers/fpga/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/device.h	patch \|	diff1 \|	diff2 \|	blob \| history