Subject: Re: linux-next: manual merge of the acpi tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 1 Dec 2008 14:02:33 +1100

Hi Len,

On Sun, 30 Nov 2008 21:55:38 -0500 (EST) Len Brown <[email-masked]> wrote:
>
> So if you pull the acpi tree into a copy of Linus' tree
> then this type of conflict will go away.

And if you pull Linus' tree into the acpi tree the conflict will go away
as well ... but you (who understand the intention of the code) get to fix
it up rather than me (who is guessing).

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/