]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fd334e1 c58ca75)
Merge branch 'd3' into release
authorLen Brown <len.brown@intel.com>
Fri, 30 Mar 2012 20:21:26 +0000 (16:21 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 30 Mar 2012 20:21:26 +0000 (16:21 -0400)
commitef5f28591066173a56547bb5b28c771a8310ec46
tree67e4709b760582bdca00e596a2ea68bafb4ccc09tree | snapshot
parentfd334e125efddc0f95572f79843d6c844584d906commit | diff
parentc58ca75cbbd1f058ad5ee0f7a09a2963aebce5cecommit | diff
Merge branch 'd3' into release

Conflicts:
drivers/acpi/sleep.c

This was a text conflict between
2769b06bfb78c854a559ac64e57682e3e879f616
(ACPI: Move module parameter gts and bfs to sleep.c)

which added #include <linux/module.h>

and

c58ca75cbbd1f058ad5ee0f7a09a2963aebce5ce
(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>
drivers/acpi/scan.c diff1 | diff2 | blob | history
drivers/acpi/sleep.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.