]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: df17618 039556a)
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)
commitcdb66413f088cb3646f723cc1b5824a4668aafee
tree67e4709b760582bdca00e596a2ea68bafb4ccc09tree | snapshot
parentdf17618bacff6e117bd03312e971026f180e61c6commit | diff
parent039556a27077516ce8e0493d340706af1c581411commit | diff
Merge branch 'd3' into release

Conflicts:
drivers/acpi/sleep.c

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

which added #include <linux/module.h>

and

039556a27077516ce8e0493d340706af1c581411
(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.