From mboxrd@z Thu Jan  1 00:00:00 1970
From: shawnguo@kernel.org (Shawn Guo)
Date: Thu, 11 Jun 2015 08:34:31 +0800
Subject: [GIT PULL v2 2/4] ARM: imx: soc updates for 4.2
In-Reply-To: <7hk2vbi08y.fsf@deeprootsystems.com>
References: <20150604023903.GB17189@dragon>
 <7hk2vbi08y.fsf@deeprootsystems.com>
Message-ID: <20150611003431.GA6377@tiger>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

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.

Shawn