[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20110510200154.GA12044@kroah.com>
Date: Tue, 10 May 2011 13:01:54 -0700
From: Greg KH <greg@...ah.com>
To: Mark Brown <broonie@...nsource.wolfsonmicro.com>
Cc: Alan Cox <alan@...rguk.ukuu.org.uk>, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 01/23] intel_sst: Save audio state across D3 on Medfield
On Wed, May 04, 2011 at 09:57:53AM +0100, Mark Brown wrote:
> On Tue, May 03, 2011 at 04:06:30PM -0700, Greg KH wrote:
> > On Tue, May 03, 2011 at 11:59:17PM +0100, Alan Cox wrote:
>
> > > Best bet is to apply Mark's patch into your git tree then apply mine on
> > > top I think. Git will see the same patch in both trees and resolve it all
> > > nicely for -next.
>
> > Have a pointer to which patch that was?
>
> It's 774fd7 (sst: fix compile error) which is in -next.
That's one of the, I needed another as well :)
Anyway, I've queued all of these up now so hopefully we should all be in
sync correctly.
thanks,
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists