Merge branch 'devel-stable' into for-next

Documentation/CodeOfConflict

Documentation/cgroups/unified-hierarchy.txt

...mentation/devicetree/bindings/arm/exynos/power_domain.txt

Documentation/devicetree/bindings/arm/pmu.txt

Documentation/devicetree/bindings/arm/sti.txt

Documentation/devicetree/bindings/i2c/i2c-imx.txt

Documentation/devicetree/bindings/net/amd-xgbe-phy.txt

Documentation/devicetree/bindings/net/apm-xgene-enet.txt

Documentation/devicetree/bindings/power/power_domain.txt

Documentation/devicetree/bindings/serial/8250.txt

...entation/devicetree/bindings/serial/axis,etraxfs-uart.txt

...mentation/devicetree/bindings/serial/snps-dw-apb-uart.txt

Documentation/devicetree/bindings/submitting-patches.txt

Documentation/devicetree/bindings/vendor-prefixes.txt

Documentation/devicetree/bindings/watchdog/atmel-wdt.txt

Documentation/filesystems/dlmfs.txt

Documentation/filesystems/ocfs2.txt

Documentation/power/suspend-and-interrupts.txt

MAINTAINERS

Makefile