mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2026-11-19 20:00:30 +00:00
Conflicts: drivers/acpi/sleep.c This was a text conflict betweena2ef5c4fd4(ACPI: Move module parameter gts and bfs to sleep.c) which added #include <linux/module.h> andb24e509885(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>
1612 lines
39 KiB
1612 lines
39 KiB