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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 16 Jul 2008 15:33:16 +1000

Hi Len,

Today's linux-next merge of the acpi tree got conflicts in
arch/x86/kernel/acpi/sleep.c between commits
3bf2e77453a87c22eb57ed4926760ac131c84459 ("x86, suspend, acpi: enter Big
Real Mode") and 065cb3dfe24978651caedfa54da585388ad15dde ("x86, suspend,
acpi: correct and add comments about Big Real Mode") from Linus' tree and
commit 60d40a50886415040888bde5133ccfeab40d945f ("x86 ACPI: normalize
segment descriptor register on resume") from the acpi tree (which also
appears to be in Linus' tree).

I used the version from Linus' tree.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/