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/mach-imx/Kconfig between commit e49d9b375628 ("ARM: Remove ARCH_HAS_CPUFREQ config option") from the arm-soc tree and commit 7de46855b1e7 ("ARM: imx5: move SOC_IMX5 and SOC_IMX51 into 'Device tree only'") from the im

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

On Sun, Jan 5, 2014 at 3:49 PM, Stephen Rothwell wrote: > 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 c

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 su