Merge branch 'dt/property-move' into dt/next

author Rob Herring <robh@kernel.org>

Wed, 5 Jul 2017 13:31:52 +0000 (08:31 -0500)

committer Rob Herring <robh@kernel.org>

Wed, 5 Jul 2017 13:31:52 +0000 (08:31 -0500)
author Rob Herring <robh@kernel.org>
Wed, 5 Jul 2017 13:31:52 +0000 (08:31 -0500)
committer Rob Herring <robh@kernel.org>
Wed, 5 Jul 2017 13:31:52 +0000 (08:31 -0500)
diff --cc drivers/of/base.c
Simple merge
diff --cc include/linux/of.h
Simple merge
author	Rob Herring <robh@kernel.org>
	Wed, 5 Jul 2017 13:31:52 +0000 (08:31 -0500)
committer	Rob Herring <robh@kernel.org>
	Wed, 5 Jul 2017 13:31:52 +0000 (08:31 -0500)
		1	2
drivers/of/base.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/of.h	patch \|	diff1 \|	diff2 \|	blob \| history