lkml.org 
[lkml]   [2014]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the imx-mxs tree with the arm-soc tree
Hi Shawn,

Today's linux-next merge of the imx-mxs tree got a conflict in
arch/arm/boot/dts/imx51-apf51.dts between commit 8f568b496dd9 ("ARM: imx:
Explicitly pass the active level of the PHY reset") from the arm-soc tree
and commit 756c8d5762c2 ("ARM: dts: i.MX51 boards: Switch to use standard
GPIO flags definitions") from the imx-mxs tree.

I fixed it up (again, I arbitrarily chose to go with the latter) and can
carry the fix as necessary (no action is required).

--
Cheers,
Stephen Rothwell <sfr@canb.auug.org.au>
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2014-01-06 01:21    [W:0.021 / U:0.056 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site