Merge branch 'omap-for-v4.6/dt-gpmc' into omap-for-v4.6/dt

diff --cc arch/arm/boot/dts/am335x-cm-t335.dts
Simple merge

diff --cc arch/arm/boot/dts/am4372.dtsi
Simple merge

diff --cc arch/arm/boot/dts/am43x-epos-evm.dts
Simple merge

diff --cc arch/arm/boot/dts/dra7.dtsi
Simple merge

diff --cc arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
Simple merge

diff --cc arch/arm/boot/dts/logicpd-torpedo-som.dtsi
Simple merge

diff --cc arch/arm/boot/dts/omap3-igep.dtsi
Simple merge

diff --cc arch/arm/boot/dts/omap3-igep0030-common.dtsi
Simple merge