From: Len Brown <len.brown@intel.com>
Date: Fri, 30 Mar 2012 20:21:26 +0000 (-0400)
Subject: Merge branch 'd3' into release
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ec612fcf43e09f5e05d37baf4d3f138b3fcc2f3d;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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

ec612fcf43e09f5e05d37baf4d3f138b3fcc2f3d
diff --cc drivers/acpi/sleep.c
index acf81fe86b53,00fa664d5fd8..1d661b5c3287
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@@ -17,7 -17,7 +17,8 @@@
  #include <linux/suspend.h>
  #include <linux/reboot.h>
  #include <linux/acpi.h>
 +#include <linux/module.h>
+ #include <linux/pm_runtime.h>
  
  #include <asm/io.h>