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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 17 Jul 2008 14:29:28 +1000

Hi Len,

On Thu, 17 Jul 2008 14:00:19 +1000 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next merge of the acpi tree got a conflict in
> Documentation/ABI/testing/sysfs-firmware-acpi.
> 
> It was just white space different from Linus' tree.

This was true of several other files as well.

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