Messages in this thread | | | Date | Wed, 12 May 2010 11:21:17 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the acpi tree with Linus' tree |
| |
Hi Len,
Today's linux-next merge of the acpi tree got a conflict in drivers/acpi/sleep.c between commit 7d6fb7bd1919517937ec390f6ca2d7bcf4f89fb6 ("ACPI: sleep: eliminate duplicate entries in acpisleep_dmi_table[]") from Linus' tree and commit 7e962fbadef538365228962b9dd869f95d745dd5 ("ACPI: delete DMI blacklist for sci_en_on_resume") from the acpi tree.
I fixed it up and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |