Hi Kristen,

At Fri, 10 Feb 2006 11:28:24 -0800,
Kristen Accardi <[EMAIL PROTECTED]> wrote:
> 
> 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.

OK, I understood.
However, I can not insmod acpiphp on 2.6.12-rc2-mm1 because
of the dock related error(I reported to list a little while
ago), I'll merge it after the error is fixed.

Unfortunately, I don't have any laptop with _DCK method. So
I can't fix/test the patch.

Thanks,
MUNE

-
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