linux-next: manual merge of the driver-core tree with the pm tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/acpi/Kconfig between commit cb2b212bc7ff ("ACPI / scan: Make
container driver use struct acpi_scan_handler") from the pm tree and
commit f756f28b84af ("drivers/acpi: remove depends on CONFIG_EXPERIMENTAL")
from the driver-core tree.

I fixed it up and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature