From mboxrd@z Thu Jan  1 00:00:00 1970
From: olof@lixom.net (Olof Johansson)
Date: Sun, 9 Mar 2014 12:04:52 -0700
Subject: [GIT PULL] ARM: imx: soc changes for 3.15
In-Reply-To: <20140305051543.GB23980@S2101-09.ap.freescale.net>
References: <20140305051543.GB23980@S2101-09.ap.freescale.net>
Message-ID: <20140309190452.GN22881@quad.lixom.net>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On Wed, Mar 05, 2014 at 01:15:45PM +0800, Shawn Guo wrote:
> Hi,
> 
> This is the imx soc changes I collected for 3.15.  To avoid quite a few
> annoying conflicts, I have to base the change set on 3.14-rc4 and Rob's
> kconfig-cleanup-for-3.15.  Please be noted, there is conflict between
> 3.14-rc4 and kconfig-cleanup-for-3.15 on arch/arm/mach-omap2/Kconfig.
> The conflict is quite obvious and easy to resolve though.
> 
> Shawn
> 
> The following changes since commit c1b2a174c33ae2bd453e40199de4f93c684500e6:
> 
>   Merge tag 'kconfig-cleanup-for-3.15' into imx/soc (2014-03-05 10:31:54 +0800)
> 
> are available in the git repository at:
> 
> 
>   git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-soc-3.15

Pulled, thanks.


-Olof