Hi Rafael,

Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/scan.c between commit 5c7dd710f691 ("ACPI / PCI / PM: Fix
device PM regression related to D3hot/D3cold") from the  tree and commit
6ef564fd2070 ("ACPI / PM: Evaluate _PS3 when entering D3 Cold") from the
pm tree.

I fixed it up (by using the version from Linus' tree) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au