Merge branch 'acpi-cleanup' into acpi-hotplug

Conflicts:
	drivers/acpi/scan.c

diff --cc drivers/acpi/bus.c
Simple merge

diff --cc drivers/acpi/dock.c
Simple merge

diff --cc drivers/acpi/osl.c
Simple merge

diff --cc drivers/acpi/pci_root.c
Simple merge

diff --cc drivers/acpi/scan.c
index 311904c,56421a9..5383c81
--- 1/drivers/acpi/scan.c
--- 2/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

diff --cc drivers/xen/xen-acpi-cpuhotplug.c
Simple merge

diff --cc drivers/xen/xen-acpi-memhotplug.c
Simple merge

diff --cc include/acpi/acpi_bus.h
Simple merge