linux-next: manual merge of the acpi tree with Linus' tree

From: Stephen Rothwell
Date: Tue May 11 2010 - 21:22:21 EST

Next message: Tomohiro Kusumi: "[PATCH] fix hard-coded disk header chunk size for persistent snapshot"
Previous message: Arve Hjønnevåg: "Re: [PATCH 0/8] Suspend block api (version 6)"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature

Next message: Tomohiro Kusumi: "[PATCH] fix hard-coded disk header chunk size for persistent snapshot"
Previous message: Arve Hjønnevåg: "Re: [PATCH 0/8] Suspend block api (version 6)"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]