Merge branch 'd3' into release
Conflicts: drivers/acpi/sleep.c This was a text conflict between a2ef5c4f (ACPI: Move module parameter gts and bfs to sleep.c) which added #include <linux/module.h> and b24e5098 (ACPI, PCI: Move acpi_dev_run_wake() to ACPI core) which added #include <linux/pm_runtime.h> The resolution was to take them both. Signed-off-by: Len Brown <len.brown@intel.com>
Showing
Please register or sign in to comment