merge to:...

merge to: https://github.com/RobertCNelson/linux/commit/150a8dcf109f68f322bf112c7604f2d950303f00

 (broken)

  DTC     arch/arm/boot/dts/omap2420-h4.dtb
Error: arch/arm/boot/dts/imx6q.dtsi:225.8-9 syntax error
FATAL ERROR: Unable to parse input tree
make[1]: *** [arch/arm/boot/dts/imx6q-arm2.dtb] Error 1
make[1]: *** Waiting for unfinished jobs....
Error: arch/arm/boot/dts/imx6q.dtsi:225.8-9 syntax error
FATAL ERROR: Unable to parse input tree
Error: arch/arm/boot/dts/imx6q.dtsi:225.8-9 syntax error
FATAL ERROR: make[1]: Unable to parse input tree
*** [arch/arm/boot/dts/imx6q-sabreauto.dtb] Error 1
make[1]: *** [arch/arm/boot/dts/imx6q-sabrelite.dtb] Error 1
Error: arch/arm/boot/dts/imx6q.dtsi:225.8-9 syntax error
FATAL ERROR: Unable to parse input tree
make[1]: *** [arch/arm/boot/dts/imx6q-sabresd.dtb] Error 1
Error: arch/arm/boot/dts/imx6q.dtsi:225.8-9 syntax error
FATAL ERROR: Unable to parse input tree
make[1]: *** [arch/arm/boot/dts/imx6q-sbc6x.dtb] Error 1
make: *** [dtbs] Error 2

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>