From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sat, 7 Dec 2013 00:05:17 +0000 (+0100)
Subject: Merge branch 'acpi-cleanup' into acpi-hotplug
X-Git-Tag: v3.14-rc1~107^2~11^2~11
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9ccad66f0171578445175ecd3bf66b35a96aaf6e;p=linux.git

Merge branch 'acpi-cleanup' into acpi-hotplug

Conflicts:
	drivers/acpi/scan.c
---

9ccad66f0171578445175ecd3bf66b35a96aaf6e
diff --cc drivers/acpi/scan.c
index 311904c720b1,56421a921a2b..5383c81a8a1b
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@ -12,10 -12,6 +12,8 @@@
  #include <linux/dmi.h>
  #include <linux/nls.h>
  
- #include <acpi/acpi_drivers.h>
- 
 +#include <asm/pgtable.h>
 +
  #include "internal.h"
  
  #define _COMPONENT		ACPI_BUS_COMPONENT