On Mon, Jan 27, 2014 at 02:37:45PM +0000, Russell King - ARM Linux wrote:
On Sun, Jan 26, 2014 at 12:43:03AM +0800, Shawn Guo wrote:
quoted
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.
Dropped hummingboard from my tree.
Shawn