From mboxrd@z Thu Jan  1 00:00:00 1970
From: olof@lixom.net (Olof Johansson)
Date: Mon, 4 Feb 2013 22:25:34 -0800
Subject: [GIT PULL] imx6q cpuidle for 3.9
In-Reply-To: <20130205020344.GA11039@S2101-09.ap.freescale.net>
References: <20130129054635.GA21504@S2101-09.ap.freescale.net>
 <20130129175028.GC17935@quad.lixom.net>
 <20130130131920.GD2757@S2101-09.ap.freescale.net>
 <20130205020344.GA11039@S2101-09.ap.freescale.net>
Message-ID: <20130205062534.GB13049@quad.lixom.net>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On Tue, Feb 05, 2013 at 10:03:47AM +0800, Shawn Guo wrote:
> On Wed, Jan 30, 2013 at 09:19:22PM +0800, Shawn Guo wrote:
> > On Tue, Jan 29, 2013 at 09:50:28AM -0800, Olof Johansson wrote:
> > > This has some small conflicts with the cleanup branch. Can you please base it
> > > on top of cleanup so we can avoid the merge conflicts when things go upstream?
> > > It's common to have the per-soc cleanup branches as bases for some of the
> > > feature branches just for this reason.
> > > 
> > Ok, done as below.
> > 
> Ping?

Yeah, sorry -- pulled now as imx/cpuidle, included in next/soc.


-Olof