Merge branch 'acpi-dev-pm' into acpi-enumeration

Subsequent commits in this branch will depend on 'acpi-dev-pm'
material.

diff --cc drivers/acpi/Makefile
Simple merge

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

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

diff --cc include/linux/acpi.h
index 32fbc4e,28ba643..3574e4a
--- 1/include/linux/acpi.h
--- 2/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@@ -25,8 -25,8 +25,9 @@@
  #ifndef _LINUX_ACPI_H
  #define _LINUX_ACPI_H
  
+ #include <linux/errno.h>
  #include <linux/ioport.h>     /* for struct resource */
 +#include <linux/device.h>
  
  #ifdef        CONFIG_ACPI