On Sun, Jan 26, 2014 at 12:43:03AM +0800, Shawn Guo wrote: > arch/arm/boot/dts/imx6dl-hummingboard.dts | 5 +- > arch/arm/boot/dts/imx6qdl-microsom.dtsi | 5 +- I've merged your changes here into my local copy of these just to reduce the conflicts - unfortunately, it's taken soo long to deal with the above that the cubox-i has now been released, which has prompted some reorganisation between the above two files. I would much rather you dropped these two entirely, and let me push them upstream, rather than having some nasty conflicts which result from this. -- FTTC broadband for 0.8mile line: 5.8Mbps down 500kbps up. Estimation in database were 13.1 to 19Mbit for a good line, about 7.5+ for a bad. Estimate before purchase was "up to 13.2Mbit". -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
