Subject: linux-next: manual merge of acpi tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 13 Jun 2008 14:53:57 +1000

Hi Len, Rafael,

Today's linux-next merge of the acpi tree got a context conflict in
drivers/acpi/sleep/main.c between commit
d8f3de0d2412bb91639cfefc5b3c79dbf3812212 ("Suspend-related patches for
2.6.27") from the pci tree and a couple of commits that are duplicate in
the pci and acpi trees ("ACPI PM: acpi_pm_device_sleep_state() cleanup"
and "ACPI PM: Remove obsolete Toshiba workaround").

I used the version from the pci tree.

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