[GIT PULL v2 2/4] ARM: imx: soc updates for 4.2

Shawn Guo shawnguo at kernel.org
Wed Jun 10 17:34:31 PDT 2015

On Wed, Jun 10, 2015 at 04:58:53PM -0700, Kevin Hilman wrote:
> This had a minor conflict with "ARM: vf610: enable Cortex-M4
> configuration on Vybrid SoC" already in next/soc.  Please make sure
> that my resolution of arch/arm/mach-imx/Kconfig looks right.

The resolution looks good to me.  Thanks, Kevin.


More information about the linux-arm-kernel mailing list