Messages in this thread |  | | | Date | Wed, 4 May 2011 09:57:53 +0100 | | From | Mark Brown <> | | Subject | Re: [PATCH 01/23] intel_sst: Save audio state across D3 on Medfield |
| |
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.
|  |