Merge branch 'dt-doc-cleanup' into for-next

author Rob Herring <robh@kernel.org>

Thu, 22 Oct 2015 14:22:09 +0000 (09:22 -0500)

committer Rob Herring <robh@kernel.org>

Thu, 22 Oct 2015 14:22:09 +0000 (09:22 -0500)
author Rob Herring <robh@kernel.org>
Thu, 22 Oct 2015 14:22:09 +0000 (09:22 -0500)
committer Rob Herring <robh@kernel.org>
Thu, 22 Oct 2015 14:22:09 +0000 (09:22 -0500)
diff --cc Documentation/devicetree/bindings/display/st,stih4xx.txt
Simple merge
author	Rob Herring <robh@kernel.org>
	Thu, 22 Oct 2015 14:22:09 +0000 (09:22 -0500)
committer	Rob Herring <robh@kernel.org>
	Thu, 22 Oct 2015 14:22:09 +0000 (09:22 -0500)