Merge remote-tracking branch 'devicetree/devicetree/next'

Conflicts:
	Documentation/devicetree/bindings/mips/brcm/brcm,bcm3384-intc.txt
	Documentation/devicetree/bindings/mips/brcm/brcm,cm-dsl.txt

diff --cc Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/rcar-du/rcar_du_kms.c
Simple merge

diff --cc drivers/media/platform/am437x/am437x-vpfe.c
Simple merge

diff --cc drivers/media/platform/soc_camera/soc_camera.c
Simple merge

diff --cc drivers/of/base.c
Simple merge

diff --cc include/linux/of.h
Simple merge