linux-next: manual merge of the imx-mxs tree with the tree

From: Stephen Rothwell
Date: Sun Jan 05 2014 - 18:49:50 EST

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).

Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>

Attachment: pgp00000.pgp
Description: PGP signature