[PATCH] ARM: imx: rename uart and fec device tree nodes

Shawn Guo shawn.guo at linaro.org
Fri May 4 09:48:28 EDT 2012


On Fri, May 04, 2012 at 03:35:51PM +0200, Dirk Behme wrote:
> Yes, I think so
> 
> https://github.com/dirkbehme/linux-imx6/commit/ebfac55f157425b5e063cdb2d9668b45a0a6515f#diff-14
> 
> >It reminds me that I should rebase my imx/dt branch on Sascha's clk
> >series to save the conflict.
> 
> My test branch has Sascha's clk series, too. It's mainly based on
> 
> https://github.com/dirkbehme/linux-imx6/commits/linux-imx6-staging
> 
If you have Sascha's clk series merged, the changes on clock-imx6q.c
made by this patch could probably get lost, since Sascha's clk series
will remove clock-imx6q.c.

-- 
Regards,
Shawn



More information about the linux-arm-kernel mailing list