tree 67e4709b760582bdca00e596a2ea68bafb4ccc09
parent 73f05330497b98c45d157b7d0c60673798bb4c3b
parent b24e5098853653554baf6ec975b9e855f3d6e5c0
author Len Brown <len.brown@intel.com> 1333138886 -0400
committer Len Brown <len.brown@intel.com> 1333138886 -0400

Merge branch 'd3' into release

Conflicts:
	drivers/acpi/sleep.c

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

which added #include <linux/module.h>

and

b24e5098853653554baf6ec975b9e855f3d6e5c0
(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>