On Tue, 2006-02-07 at 12:13 -0800, Greg KH wrote:
> On Tue, Jan 31, 2006 at 10:20:18AM -0800, Kristen Accardi wrote:
> > Just reviewing them, they seem like they will be fine to me.
> 
> This conflicts with your other patch you sent me.  I'll keep yours, and
> drop this one, and let you merge his in with yours.
> 
> Is that ok?
> 
> thanks,
> 
> greg k-h

I tried to merge this in against 2.6.16-rc2-mm1, which contains the
patch you kept, and there are compile issues in his patch still.  I
think it would be best if Muneda merged these himself.

Kristen


-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to