Messages in this thread | | | Date | Mon, 6 Jan 2014 10:49:38 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the imx-mxs tree with the tree |
| |
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in arch/arm/boot/dts/imx6q-sabrelite.dts between commit 8f568b496dd9 ("ARM: imx: Explicitly pass the active level of the PHY reset") from the arm-soc tree and commit e5a5af250568 ("ARM: dts: imx: sabrelite: add Dual Lite/Solo support") from the imx-mxs tree.
I fixed it up (just used 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] | |